From: David Lechner <david@lechnology.com>
To: nsekhar@ti.com, khilman@kernel.org,
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>,
Kishon Vijay Abraham I <kishon@ti.com>,
Alan Stern <stern@rowland.harvard.edu>, Bin Liu <b-liu@ti.com>,
Lee Jones <lee.jones@linaro.org>
Cc: David Lechner <david@lechnology.com>,
petr@barix.com, sergei.shtylyov@cogentembedded.com,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org
Subject: [PATCH v5 6/7] usb: musb: da8xx: Use devm in probe
Date: Mon, 9 May 2016 18:40:02 -0500 [thread overview]
Message-ID: <1462837203-12125-7-git-send-email-david@lechnology.com> (raw)
In-Reply-To: <1462837203-12125-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-05-09 23:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 23:39 [PATCH v5 0/7] da8xx USB PHY (was da8xx USB clocks) David Lechner
2016-05-09 23:39 ` [PATCH v5 1/7] mfd: da8xx-cfgchip: New header file for CFGCHIP registers David Lechner
2016-07-21 13:23 ` Kishon Vijay Abraham I
2016-05-09 23:39 ` [PATCH v5 2/7] dt-bindings: Add bindings for phy-da8xx-usb David Lechner
2016-05-09 23:39 ` [PATCH v5 3/7] phy: Add set_mode callback David Lechner
2016-06-22 5:57 ` Kishon Vijay Abraham I
[not found] ` <576A28BF.4040805-l0cyMroinI0@public.gmane.org>
2016-06-22 17:00 ` David Lechner
2016-06-27 12:47 ` Kishon Vijay Abraham I
2016-07-04 12:52 ` Kishon Vijay Abraham I
2016-05-09 23:40 ` [PATCH v5 4/7] phy: da8xx-usb: new driver for DA8xx SoC USB PHY David Lechner
2016-06-10 13:16 ` Sekhar Nori
[not found] ` <575ABDB9.8000502-l0cyMroinI0@public.gmane.org>
2016-06-22 16:58 ` David Lechner
2016-06-22 17:15 ` David Lechner
2016-05-09 23:40 ` David Lechner [this message]
[not found] ` <1462837203-12125-1-git-send-email-david-nq/r/kbU++upp/zk7JDF2g@public.gmane.org>
2016-05-09 23:40 ` [PATCH v5 5/7] usb: ohci-da8xx: Remove code that references mach David Lechner
2016-05-09 23:40 ` [PATCH v5 7/7] usb: musb: da8xx: Remove mach code David Lechner
2016-06-27 12:48 ` [PATCH v5 0/7] da8xx USB PHY (was da8xx USB clocks) Kishon Vijay Abraham I
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=1462837203-12125-7-git-send-email-david@lechnology.com \
--to=david@lechnology.com \
--cc=b-liu@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=khilman@kernel.org \
--cc=kishon@ti.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nsekhar@ti.com \
--cc=pawel.moll@arm.com \
--cc=petr@barix.com \
--cc=robh+dt@kernel.org \
--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).