From: David Lechner <david@lechnology.com>
To: Alan Stern <stern@rowland.harvard.edu>, Bin Liu <b-liu@ti.com>
Cc: David Lechner <david@lechnology.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
khilman@kernel.org, nsekhar@ti.com,
Kishon Vijay Abraham I <kishon@ti.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Subject: [PATCH v6 2/3] usb: musb: da8xx: Use devm in probe
Date: Mon, 5 Sep 2016 15:00:32 -0500 [thread overview]
Message-ID: <1473105633-21653-3-git-send-email-david@lechnology.com> (raw)
In-Reply-To: <1473105633-21653-1-git-send-email-david@lechnology.com>
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
next prev parent reply other threads:[~2016-09-05 20:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-05 20:00 [PATCH v6 0/3] da8xx USB PHY platform devices and clocks David Lechner
2016-09-05 20:00 ` [PATCH v6 1/3] usb: ohci-da8xx: Remove code that references mach David Lechner
2016-10-04 9:18 ` Kevin Hilman
2016-10-04 13:38 ` Greg Kroah-Hartman
2016-10-04 17:30 ` David Lechner
2016-10-04 19:52 ` Greg Kroah-Hartman
2016-09-05 20:00 ` David Lechner [this message]
2016-09-06 19:17 ` [PATCH v6 2/3] usb: musb: da8xx: Use devm in probe Bin Liu
2016-09-12 17:19 ` Bin Liu
2016-09-05 20:00 ` [PATCH v6 3/3] usb: musb: da8xx: Remove mach code David Lechner
2016-09-06 19:19 ` [PATCH v6 0/3] da8xx USB PHY platform devices and clocks Bin Liu
2016-09-12 17:18 ` Bin Liu
2016-09-12 18:01 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473105633-21653-3-git-send-email-david@lechnology.com \
--to=david@lechnology.com \
--cc=b-liu@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@kernel.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).