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>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 58fa0c90c7c7..ca7506390542 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -18,6 +18,7 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/hrtimer.h>
 #include <linux/io.h>
@@ -104,9 +105,9 @@ static int ehci_platform_probe(struct platform_device *dev)
         hcd->rsrc_start = res_mem->start;
         hcd->rsrc_len = resource_size(res_mem);
 
-        hcd->regs = devm_request_and_ioremap(&dev->dev, res_mem);
-        if (!hcd->regs) {
-                err = -ENOMEM;
+        hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
+        if (IS_ERR(hcd->regs)) {
+                err = PTR_ERR(hcd->regs);
                 goto err_put_hcd;
         }
         err = usb_add_hcd(hcd, irq, IRQF_SHARED);