summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-grlib.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 11:09:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-22 20:41:58 +0100
commit148e11349b0c9c7199fd3096254bd3ea16d59a05 (patch)
tree48fa3e59a152ad95b4e545e1e623c3e442653d53 /drivers/usb/host/ehci-grlib.c
parentserial: Convert to devm_ioremap_resource() (diff)
downloadlinux-148e11349b0c9c7199fd3096254bd3ea16d59a05.tar.xz
linux-148e11349b0c9c7199fd3096254bd3ea16d59a05.zip
usb: Convert to devm_ioremap_resource()
Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. devm_ioremap_resource() provides its own error messages so all explicit error messages can be removed from the failure code paths. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-grlib.c')
-rw-r--r--drivers/usb/host/ehci-grlib.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 1fc89292f5d6..5d75de9729b6 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -25,7 +25,7 @@
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+#include <linux/err.h>
#include <linux/signal.h>
#include <linux/of_irq.h>
@@ -118,10 +118,9 @@ static int ehci_hcd_grlib_probe(struct platform_device *op)
goto err_irq;
}
- hcd->regs = devm_request_and_ioremap(&op->dev, &res);
- if (!hcd->regs) {
- pr_err("%s: devm_request_and_ioremap failed\n", __FILE__);
- rv = -ENOMEM;
+ hcd->regs = devm_ioremap_resource(&op->dev, &res);
+ if (IS_ERR(hcd->regs)) {
+ rv = PTR_ERR(hcd->regs);
goto err_ioremap;
}