w1: mxc_w1: Convert to devm_ioremap_resource()

According to Documentation/driver-model/devres.txt:

  devm_request_and_ioremap() : obsoleted by devm_ioremap_resource()

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 950d354d50e2dd593d8666078ff39ae4c5b3247f..47e12cfc2a570cb5d379863e7a73dfcfd6711597 100644 (file)
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -121,9 +121,9 @@ static int mxc_w1_probe(struct platform_device *pdev)
        mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       mdev->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (!mdev->regs)
-               return -EBUSY;
+       mdev->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mdev->regs))
+               return PTR_ERR(mdev->regs);
 
        clk_prepare_enable(mdev->clk);
        __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);