diff options
| author | Varka Bhadram <varkabhadram@gmail.com> | 2014-10-24 04:12:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-28 00:16:01 +0100 |
| commit | 5e9b4dce850d6e3d3dbd1ee7f9466c875c20e487 (patch) | |
| tree | 179aada544ba94c10828942f9f37a79e11fbb35d /drivers/net/ethernet/wiznet | |
| parent | bridge: Add support for IEEE 802.11 Proxy ARP (diff) | |
| download | linux-5e9b4dce850d6e3d3dbd1ee7f9466c875c20e487.tar.xz linux-5e9b4dce850d6e3d3dbd1ee7f9466c875c20e487.zip | |
ethernet: wiznet: remove unnecessary check
devm_ioremap_resource checks platform_get_resource() return value.
We can remove the duplicate check here.
Signed-off-by: Varka Bhadram <varkab@cdac.in>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/wiznet')
| -rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/wiznet/w5300.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 0f56b1c0e082..70a930ac4fa9 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -638,14 +638,12 @@ static int w5100_hw_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) - return -ENXIO; - mem_size = resource_size(mem); - priv->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + mem_size = resource_size(mem); + spin_lock_init(&priv->reg_lock); priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE; if (priv->indirect) { diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index f961f14a0473..7974b7d90fcc 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c @@ -558,14 +558,12 @@ static int w5300_hw_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) - return -ENXIO; - mem_size = resource_size(mem); - priv->base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + mem_size = resource_size(mem); + spin_lock_init(&priv->reg_lock); priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE; if (priv->indirect) { |