summaryrefslogtreecommitdiff
path: root/drivers/staging/netlogic
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-06-10 17:05:08 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-11 17:13:38 -0700
commit803c83fc11ac43fbd08f6b8cf6cebafa67f0dfae (patch)
tree5144094ad940a5475ac1cca7dd22a727dc821885 /drivers/staging/netlogic
parent773fe724ab7ca9c32e2411eb2d85ea455e82714e (diff)
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>
Diffstat (limited to 'drivers/staging/netlogic')
-rw-r--r--drivers/staging/netlogic/xlr_net.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index dd98cb1468a4..b529d79d0661 100644
--- 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);