diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-02-28 00:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-28 16:57:24 -0500 |
commit | d1b44ce1a37ee667dfdd0770c6f0b08dae7ebad8 (patch) | |
tree | fde49878b7da3cbb86cebfcfd44ce5b54c3f66fb /drivers/net/ethernet/wiznet | |
parent | 52f1454f629fafbfb47ad6727e0837250e1f08c0 (diff) |
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.c | 9 |
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) | |||
561 | if (!mem) | 561 | if (!mem) |
562 | return -ENXIO; | 562 | return -ENXIO; |
563 | mem_size = resource_size(mem); | 563 | mem_size = resource_size(mem); |
564 | if (!devm_request_mem_region(&pdev->dev, mem->start, mem_size, name)) | 564 | |
565 | return -EBUSY; | 565 | priv->base = devm_ioremap_resource(&pdev->dev, mem); |
566 | priv->base = devm_ioremap(&pdev->dev, mem->start, mem_size); | 566 | if (IS_ERR(priv->base)) |
567 | if (!priv->base) | 567 | return PTR_ERR(priv->base); |
568 | return -EBUSY; | ||
569 | 568 | ||
570 | spin_lock_init(&priv->reg_lock); | 569 | spin_lock_init(&priv->reg_lock); |
571 | priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE; | 570 | priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE; |