aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2014-10-23 22:12:08 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-27 19:16:01 -0400
commit7e5ae24aa009110c7c1340bf682a3e6586de39da (patch)
treebcb35f3841fc83cad67b9fd56f2b8e6098c491d3 /drivers/net/ethernet/marvell
parent534249d6e095a607bc8769bdd60941d3887dd386 (diff)
ethernet: marvell: 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/marvell')
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index bee4c369f0fe..21ddecef151e 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1450,16 +1450,14 @@ static int pxa168_eth_probe(struct platform_device *pdev)
1450 pep = netdev_priv(dev); 1450 pep = netdev_priv(dev);
1451 pep->dev = dev; 1451 pep->dev = dev;
1452 pep->clk = clk; 1452 pep->clk = clk;
1453
1453 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1454 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1454 if (res == NULL) {
1455 err = -ENODEV;
1456 goto err_netdev;
1457 }
1458 pep->base = devm_ioremap_resource(&pdev->dev, res); 1455 pep->base = devm_ioremap_resource(&pdev->dev, res);
1459 if (IS_ERR(pep->base)) { 1456 if (IS_ERR(pep->base)) {
1460 err = -ENOMEM; 1457 err = -ENOMEM;
1461 goto err_netdev; 1458 goto err_netdev;
1462 } 1459 }
1460
1463 res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 1461 res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
1464 BUG_ON(!res); 1462 BUG_ON(!res);
1465 dev->irq = res->start; 1463 dev->irq = res->start;