12 files changed, 43 insertions, 47 deletions

diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 27639487f7ac..f3beac4d06b8 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -143,10 +143,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (hcd->regs == NULL) {
-                dev_dbg(&pdev->dev, "error mapping memory\n");
-                retval = -EFAULT;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                retval = PTR_ERR(hcd->regs);
                 goto fail_request_resource;
         }
 
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;
         }
 
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index dedb80bb8d40..e2004de6ad3d 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -85,10 +85,9 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!hcd->regs) {
-                dev_err(dev, "error mapping memory\n");
-                ret = -EFAULT;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto err_alloc;
         }
 
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);
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 45aceefd0c2b..56dc732bf451 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -12,6 +12,7 @@
  * This file is licenced under the GPL.
  */
 
+#include <linux/err.h>
 #include <linux/signal.h>
 
 #include <linux/of.h>
@@ -121,10 +122,9 @@ static int ehci_hcd_ppc_of_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;
         }
 
diff --git a/drivers/usb/host/ehci-sead3.c b/drivers/usb/host/ehci-sead3.c
index efad02d947f2..f55477c5a1be 100644
--- a/drivers/usb/host/ehci-sead3.c
+++ b/drivers/usb/host/ehci-sead3.c
@@ -19,6 +19,7 @@
  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/err.h>
 #include <linux/platform_device.h>
 
 static int ehci_sead3_setup(struct usb_hcd *hcd)
@@ -112,10 +113,9 @@ static int ehci_hcd_sead3_drv_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!hcd->regs) {
-                pr_debug("ioremap failed");
-                ret = -ENOMEM;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto err1;
         }
 
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index 0c90a24fa989..3565a300f401 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -118,10 +118,9 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (hcd->regs == NULL) {
-                dev_dbg(&pdev->dev, "error mapping memory\n");
-                ret = -ENXIO;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto fail_request_resource;
         }
 
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index 11695d5b9d86..7ecf709610ba 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
 
@@ -96,10 +97,9 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev)
         hcd->rsrc_start = res->start;
         hcd->rsrc_len = resource_size(res);
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!hcd->regs) {
-                pr_debug("ioremap failed");
-                ret = -ENOMEM;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto err1;
         }
 
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index 4f285e8e404a..d845e3bcfaff 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -25,6 +25,7 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/signal.h>
 
 #include <linux/of.h>
@@ -159,10 +160,9 @@ static int ehci_hcd_xilinx_of_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_irq;
         }
 
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index 2344040c16d2..f4988fbe78e7 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -306,10 +306,9 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
                 goto out8;
         }
 
-        hcd->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (!hcd->regs) {
-                dev_err(&pdev->dev, "Failed to devm_request_and_ioremap\n");
-                ret =  -ENOMEM;
+        hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(hcd->regs)) {
+                ret = PTR_ERR(hcd->regs);
                 goto out8;
         }
         hcd->rsrc_start = res->start;
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 084503b03fcf..c3e7287f7921 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -13,6 +13,7 @@
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
+#include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/usb/ohci_pdriver.h>
 
@@ -127,9 +128,9 @@ static int ohci_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);
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index ad0f55269603..e125770b893c 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -351,10 +351,9 @@ static int usb_hcd_s3c2410_probe(const struct hc_driver *driver,
         hcd->rsrc_start = dev->resource[0].start;
         hcd->rsrc_len   = resource_size(&dev->resource[0]);
 
-        hcd->regs = devm_request_and_ioremap(&dev->dev, &dev->resource[0]);
-        if (!hcd->regs) {
-                dev_err(&dev->dev, "devm_request_and_ioremap failed\n");
-                retval = -ENOMEM;
+        hcd->regs = devm_ioremap_resource(&dev->dev, &dev->resource[0]);
+        if (IS_ERR(hcd->regs)) {
+                retval = PTR_ERR(hcd->regs);
                 goto err_put;
         }