Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1397523
| From | David Lechner <david@lechnology.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v5 6/7] usb: musb: da8xx: Use devm in probe |
| Date | 2016-05-10 01:50 +0200 |
| Message-ID | <rx363-7sX-43@gated-at.bofh.it> (permalink) |
| References | <rx361-7sX-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Simplify things a bit by using devm functions where possible.
Signed-off-by: David Lechner <david@lechnology.com>
---
drivers/usb/musb/da8xx.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index b03d3b8..0c1997c 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -490,20 +490,18 @@ static int da8xx_probe(struct platform_device *pdev)
struct da8xx_glue *glue;
struct platform_device_info pinfo;
struct clk *clk;
+ int ret;
- int ret = -ENOMEM;
-
- glue = kzalloc(sizeof(*glue), GFP_KERNEL);
+ glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
if (!glue) {
dev_err(&pdev->dev, "failed to allocate glue context\n");
- goto err0;
+ return -ENOMEM;
}
- clk = clk_get(&pdev->dev, "usb20");
+ clk = devm_clk_get(&pdev->dev, "usb20");
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "failed to get clock\n");
- ret = PTR_ERR(clk);
- goto err3;
+ return PTR_ERR(clk);
}
ret = clk_enable(clk);
@@ -560,12 +558,7 @@ err5:
clk_disable(clk);
err4:
- clk_put(clk);
-
-err3:
- kfree(glue);
-err0:
return ret;
}
@@ -576,8 +569,6 @@ static int da8xx_remove(struct platform_device *pdev)
platform_device_unregister(glue->musb);
usb_phy_generic_unregister(glue->phy);
clk_disable(glue->clk);
- clk_put(glue->clk);
- kfree(glue);
return 0;
}
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v5 0/7] da8xx USB PHY (was da8xx USB clocks) David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 7/7] usb: musb: da8xx: Remove mach code David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 3/7] phy: Add set_mode callback David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 5/7] usb: ohci-da8xx: Remove code that references mach David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 2/7] dt-bindings: Add bindings for phy-da8xx-usb David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 6/7] usb: musb: da8xx: Use devm in probe David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200 [PATCH v5 4/7] phy: da8xx-usb: new driver for DA8xx SoC USB PHY David Lechner <david@lechnology.com> - 2016-05-10 01:50 +0200
csiph-web