mfd: 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>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
index ab8d0b2739b231cd27e31b9b7b79abf0b715b418..1804331bd52c5d35b6f15b7403ed0df733e73f66 100644 (file)
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel_msic.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -424,11 +425,9 @@ static int intel_msic_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       msic->irq_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!msic->irq_base) {
-               dev_err(&pdev->dev, "failed to map SRAM memory\n");
-               return -ENOMEM;
-       }
+       msic->irq_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(msic->irq_base))
+               return PTR_ERR(msic->irq_base);
 
        platform_set_drvdata(pdev, msic);