ata: 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.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 556222f04731ea7326afdaaac3a0ccedf3cc5e10..c1bfaf43d109119e5f47d709365f91c5c170c656 100644 (file)
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -31,6 +31,7 @@
  *   Copyright (C) 2006 Tower Technologies
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -937,9 +938,9 @@ static int ep93xx_pata_probe(struct platform_device *pdev)
                goto err_rel_gpio;
        }
 
-       ide_base = devm_request_and_ioremap(&pdev->dev, mem_res);
-       if (!ide_base) {
-               err = -ENXIO;
+       ide_base = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(ide_base)) {
+               err = PTR_ERR(ide_base);
                goto err_rel_gpio;
        }