Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1364499
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | David Lechner <david@lechnology.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe |
| Date | Fri, 25 Mar 2016 01:00:03 +0100 |
| Message-ID | <rgnkv-1AF-33@gated-at.bofh.it> (permalink) |
| References | <rgnku-1AF-3@gated-at.bofh.it> |
| X-Original-To | unlisted-recipients:; (no To-header on input) |
| Dkim-Signature | v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From; bh=yOCb15NQ1GCiXurTscdn/9pAUim6S6hlP2cgd0e1hck=; b=bOmbciBKsisTT 8I94DvJtuBEK7dZOe1dZxiWWE+kBIbls5UIdi8oGOQU3hSTxDSlZA5fMgaVkkqDP6vO2XyskOngpT Cp7pOm1P5m+9Acr8hNZe4MTVH+wcNVzVZxE0YdSN0aY6Qn0lLQYPAd4mSuXilyiiIRJHi0Lpo1sPo wdA2qhER1ZUnKGRZpUK+VrgUfyIMM2pSAEgeNa/VbjqQo1WDe8QS7Fm1TZbKBYghzrHvk4+ApBSXF 8W5igHhUBSosn9QmV5Wh00ZX+fz9eUTLCW8uJsj9aoFIhmxw9j5prdoreTLauMeNsq6U4okxDMJRC uaB968v6rIaPH+G27VisQ==; |
| X-Mailer | git-send-email 1.9.1 |
| X-Antiabuse | This header was added to track abuse, please include it with any abuse report |
| X-Antiabuse | Primary Hostname - vern.gendns.com |
| X-Antiabuse | Original Domain - vger.kernel.org |
| X-Antiabuse | Originator/Caller UID/GID - [47 12] / [47 12] |
| X-Antiabuse | Sender Address Domain - lechnology.com |
| X-Get-Message-Sender-Via | vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed |
| X-Authenticated-Sender | vern.gendns.com: davidmain@lechnology.com |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 67 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | petr@barix.com, sergei.shtylyov@cogentembedded.com, David.Laight@ACULAB.COM, David Lechner <david@lechnology.com>, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Russell King <linux@arm.linux.org.uk>, Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>, Kishon Vijay Abraham I <kishon@ti.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Alan Stern <stern@rowland.harvard.edu>, Bin Liu <b-liu@ti.com>, Lee Jones <lee.jones@linaro.org>, devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-usb@vger.kernel.org (open list:USB SUBSYSTEM) |
| X-Original-Date | Thu, 24 Mar 2016 18:51:40 -0500 |
| X-Original-Message-ID | <1458863503-31121-16-git-send-email-david@lechnology.com> |
| X-Original-References | <1458863503-31121-1-git-send-email-david@lechnology.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1364499 |
Show key headers only | View raw
Simplify things a bit by using devm functions where possible.
Signed-off-by: David Lechner <david@lechnology.com>
---
v3 changes:
* Kept clk variable to minimize noise.
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;
}
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 00/16] da8xx USB clocks David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
[PATCH v3 15/16] usb: musb: da8xx: Use devm in probe David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe Bin Liu <b-liu@ti.com> - 2016-04-01 00:30 +0200
Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe David Lechner <david@lechnology.com> - 2016-04-01 00:30 +0200
Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe Bin Liu <b-liu@ti.com> - 2016-04-01 17:00 +0200
Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-04-01 12:40 +0200
[PATCH v3 11/16] ARM: davinci: da8xx: Add USB PHY platform declaration David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
[PATCH v3 12/16] ARM: dt: da850: Add cfgchip syscon node David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
[PATCH v3 07/16] ARM: davinci: da8xx: add usb phy clocks David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
[PATCH v3 13/16] ARM: dt: da850: Add usb phy node David Lechner <david@lechnology.com> - 2016-03-25 01:00 +0100
csiph-web