Input: apbps2 - convert to devm_ioremap_resource()

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.kamat@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/serio/apbps2.c b/drivers/input/serio/apbps2.c
index 2c14e6f..17e01a8 100644 (file)
--- a/drivers/input/serio/apbps2.c
+++ b/drivers/input/serio/apbps2.c
@@ -147,11 +147,9 @@ static int apbps2_of_probe(struct platform_device *ofdev)
 
        /* Find Device Address */
        res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);
-       priv->regs = devm_request_and_ioremap(&ofdev->dev, res);
-       if (!priv->regs) {
-               dev_err(&ofdev->dev, "io-regs mapping failed\n");
-               return -EBUSY;
-       }
+       priv->regs = devm_ioremap_resource(&ofdev->dev, res);
+       if (IS_ERR(priv->regs))
+               return PTR_ERR(priv->regs);
 
        /* Reset hardware, disable interrupt */
        iowrite32be(0, &priv->regs->ctrl);