pxa168_eth: remove unneeded null check
authorDan Carpenter <error27@gmail.com>
Tue, 24 Aug 2010 06:52:46 +0000 (06:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Aug 2010 21:50:26 +0000 (14:50 -0700)
"pep->pd" isn't checked consistently in this function.  For example it's
dereferenced unconditionally on the next line after the end of the if
condition.  This function is only called from pxa168_eth_probe() and
pep->pd is always non-NULL so I removed the check.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/pxa168_eth.c

index ecc64d750cce0535103aa9d22ca0232043a628b1..857a68115a5cb6678679cfcb3bc603ed9d75c234 100644 (file)
@@ -1414,10 +1414,8 @@ static int ethernet_phy_setup(struct net_device *dev)
 {
        struct pxa168_eth_private *pep = netdev_priv(dev);
 
-       if (pep->pd != NULL) {
-               if (pep->pd->init)
-                       pep->pd->init();
-       }
+       if (pep->pd->init)
+               pep->pd->init();
        pep->phy = phy_scan(pep, pep->pd->phy_addr & 0x1f);
        if (pep->phy != NULL)
                phy_init(pep, pep->pd->speed, pep->pd->duplex);