Staging: netlogic: Convert to use devm_ioremap_resource

Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: devel@driverdev.osuosl.org
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index dd98cb1..b529d79 100644 (file)
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -1020,12 +1020,12 @@ static int xlr_net_probe(struct platform_device *pdev)
                goto err_gmac;
        }
 
-       ndev->base_addr = (unsigned long) devm_request_and_ioremap
+       ndev->base_addr = (unsigned long) devm_ioremap_resource
                (&pdev->dev, res);
-       if (!ndev->base_addr) {
+       if (IS_ERR_VALUE(ndev->base_addr)) {
                dev_err(&pdev->dev,
-                               "devm_request_and_ioremap failed\n");
-               return -EBUSY;
+                               "devm_ioremap_resource failed\n");
+               return ndev->base_addr;
        }
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);