From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>, <sameo@linux.intel.com>, <tony@atomide.com>
Cc: <keshava_mgowda@ti.com>, <sshtylyov@mvista.com>, <bjorn@mork.no>,
<rogerq@ti.com>, <linux-usb@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v5 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap()
Date: Wed, 2 Jan 2013 17:00:31 +0200 [thread overview]
Message-ID: <1357138842-28964-12-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1357138842-28964-1-git-send-email-rogerq@ti.com>
Use devm_ variants of kzalloc and ioremap. Also clean up error path.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/mfd/omap-usb-host.c | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 85a4a43..b24a3ab 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -467,17 +467,20 @@ static int usbhs_omap_probe(struct platform_device *pdev)
if (!pdata) {
dev_err(dev, "Missing platform data\n");
- ret = -ENOMEM;
- goto end_probe;
+ return -ENODEV;
}
- omap = kzalloc(sizeof(*omap), GFP_KERNEL);
+ omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
if (!omap) {
dev_err(dev, "Memory allocation failed\n");
- ret = -ENOMEM;
- goto end_probe;
+ return -ENOMEM;
}
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
+ omap->uhh_base = devm_request_and_ioremap(dev, res);
+ if (!omap->uhh_base)
+ return -EADDRNOTAVAIL;
+
spin_lock_init(&omap->lock);
omap->pdata = pdata;
@@ -575,20 +578,6 @@ static int usbhs_omap_probe(struct platform_device *pdev)
"failed error:%d\n", ret);
}
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
- if (!res) {
- dev_err(dev, "UHH EHCI get resource failed\n");
- ret = -ENODEV;
- goto err_init_60m_fclk;
- }
-
- omap->uhh_base = ioremap(res->start, resource_size(res));
- if (!omap->uhh_base) {
- dev_err(dev, "UHH ioremap failed\n");
- ret = -ENOMEM;
- goto err_init_60m_fclk;
- }
-
platform_set_drvdata(pdev, omap);
omap_usbhs_init(dev);
@@ -598,13 +587,10 @@ static int usbhs_omap_probe(struct platform_device *pdev)
goto err_alloc;
}
- goto end_probe;
+ return 0;
err_alloc:
omap_usbhs_deinit(&pdev->dev);
- iounmap(omap->uhh_base);
-
-err_init_60m_fclk:
clk_put(omap->init_60m_fclk);
err_usbhost_p2_fck:
@@ -628,9 +614,7 @@ err_utmi_p1_fck:
err_end:
clk_put(omap->ehci_logic_fck);
pm_runtime_disable(dev);
- kfree(omap);
-end_probe:
return ret;
}
@@ -645,7 +629,6 @@ static int usbhs_omap_remove(struct platform_device *pdev)
struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
omap_usbhs_deinit(&pdev->dev);
- iounmap(omap->uhh_base);
clk_put(omap->init_60m_fclk);
clk_put(omap->usbhost_p2_fck);
clk_put(omap->usbhost_p1_fck);
@@ -655,7 +638,6 @@ static int usbhs_omap_remove(struct platform_device *pdev)
clk_put(omap->utmi_p1_fck);
clk_put(omap->ehci_logic_fck);
pm_runtime_disable(&pdev->dev);
- kfree(omap);
return 0;
}
--
1.7.4.1
next prev parent reply other threads:[~2013-01-02 15:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 15:00 [PATCH v5 00/22] OMAP USB Host cleanup Roger Quadros
2013-01-02 15:00 ` [PATCH v5 01/22] mfd: omap-usb-tll: Avoid creating copy of platform data Roger Quadros
2013-01-02 15:00 ` [PATCH v5 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-02 15:00 ` [PATCH v5 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-02 15:00 ` [PATCH v5 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-02 15:00 ` [PATCH v5 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-02 15:00 ` [PATCH v5 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-02 15:00 ` [PATCH v5 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-02 15:00 ` [PATCH v5 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-02 15:00 ` [PATCH v5 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2013-01-02 15:00 ` [PATCH v5 10/22] mfd: omap_usb_host: Avoid creating copy of platform_data Roger Quadros
2013-01-02 15:00 ` Roger Quadros [this message]
2013-01-02 15:00 ` [PATCH v5 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-02 15:00 ` [PATCH v5 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-03 12:52 ` Sergei Shtylyov
2013-01-04 14:06 ` Roger Quadros
2013-01-02 15:00 ` [PATCH v5 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-02 15:00 ` [PATCH v5 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-02 15:00 ` [PATCH v5 16/22] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2013-01-02 15:00 ` [PATCH v5 17/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-02 15:00 ` [PATCH v5 18/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-02 15:00 ` [PATCH v5 19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2013-01-02 15:00 ` [PATCH v5 20/22] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2013-01-02 15:00 ` [PATCH v5 21/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-02 15:00 ` [PATCH v5 22/22] mdf: omap-usb-host: get rid of build warning Roger Quadros
2013-01-04 14:17 ` [PATCH v5 00/22] OMAP USB Host cleanup Roger Quadros
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=1357138842-28964-12-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=keshava_mgowda@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sshtylyov@mvista.com \
--cc=tony@atomide.com \
/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
all inboxes | Powered by JetHome®