Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() 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: Sachin Kamat <sachin.ka...@linaro.org>
Cc: Roger Quadros <rog...@ti.com>
---
 drivers/mfd/omap-usb-host.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 4febc5c..1b49b21 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -27,6 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/usb-omap.h>
 #include <linux/pm_runtime.h>
+#include <linux/err.h>
 
 #include "omap-usb.h"
 
@@ -534,11 +535,9 @@ static int usbhs_omap_probe(struct platform_device *pdev)
        }
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
-       omap->uhh_base = devm_request_and_ioremap(dev, res);
-       if (!omap->uhh_base) {
-               dev_err(dev, "Resource request/ioremap failed\n");
-               return -EADDRNOTAVAIL;
-       }
+       omap->uhh_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(omap->uhh_base))
+               return PTR_ERR(omap->uhh_base);
 
        omap->pdata = pdata;
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to