Skip to contentSkip to conversation

pxa168_eth: remove unneeded null check

PATCH Applied Dan Carpenter 2 participants 2 messages Aug 24, 2010

Subsystems (3)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 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.

drivers/net/pxa168_eth.c +2 -4
index ecc64d7..857a681 100644
@@ -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);
maintainer Applied
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Tue, 24 Aug 2010 18:52:46 +0200

Quoted 6 lines

"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.

Applied.