summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/wiznet
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-02-28 09:47:47 +0400
committerDavid S. Miller <davem@davemloft.net>2014-03-01 01:57:24 +0400
commitd1b44ce1a37ee667dfdd0770c6f0b08dae7ebad8 (patch)
treefde49878b7da3cbb86cebfcfd44ce5b54c3f66fb /drivers/net/ethernet/wiznet
parent52f1454f629fafbfb47ad6727e0837250e1f08c0 (diff)
downloadlinux-d1b44ce1a37ee667dfdd0770c6f0b08dae7ebad8.tar.xz
net: w5300: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/wiznet')
-rw-r--r--drivers/net/ethernet/wiznet/w5300.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 71c27b3292f1..1f33c4c86c20 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -561,11 +561,10 @@ static int w5300_hw_probe(struct platform_device *pdev)
if (!mem)
return -ENXIO;
mem_size = resource_size(mem);
- if (!devm_request_mem_region(&pdev->dev, mem->start, mem_size, name))
- return -EBUSY;
- priv->base = devm_ioremap(&pdev->dev, mem->start, mem_size);
- if (!priv->base)
- return -EBUSY;
+
+ priv->base = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(priv->base))
+ return PTR_ERR(priv->base);
spin_lock_init(&priv->reg_lock);
priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;