diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-08-24 08:52:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-24 23:50:26 +0200 |
| commit | 4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a (patch) | |
| tree | 4dc87147db2e92f6b4eb9ca41813cd718ea6cdaf | |
| parent | phylib: Fix race between returning phydev and calling adjust_link (diff) | |
| download | linux-4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a.tar.xz linux-4169591fd7c260b2b0b4e8f4d51f63f5b15ad78a.zip | |
pxa168_eth: remove unneeded null check
"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>
| -rw-r--r-- | drivers/net/pxa168_eth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c index ecc64d750cce..857a68115a5c 100644 --- a/drivers/net/pxa168_eth.c +++ b/drivers/net/pxa168_eth.c @@ -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); |