ethernet: renesas: remove unnecessary check
authorVarka Bhadram <varkabhadram@gmail.com>
Fri, 24 Oct 2014 02:12:09 +0000 (07:42 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Oct 2014 23:16:01 +0000 (19:16 -0400)
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>
drivers/net/ethernet/renesas/sh_eth.c

index 60e9c2c..dbe8606 100644 (file)
@@ -2769,10 +2769,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
        /* get base addr */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (unlikely(res == NULL)) {
-               dev_err(&pdev->dev, "invalid resource\n");
-               return -EINVAL;
-       }
 
        ndev = alloc_etherdev(sizeof(struct sh_eth_private));
        if (!ndev)
@@ -2781,8 +2777,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
 
-       /* The sh Ether-specific entries in the device structure. */
-       ndev->base_addr = res->start;
        devno = pdev->id;
        if (devno < 0)
                devno = 0;
@@ -2806,6 +2800,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                goto out_release;
        }
 
+       ndev->base_addr = res->start;
+
        spin_lock_init(&mdp->lock);
        mdp->pdev = pdev;