diff options
Diffstat (limited to 'drivers/net/ethernet/smsc')
| -rw-r--r-- | drivers/net/ethernet/smsc/smc9194.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc9420.c | 4 | 
4 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c index 50823da9dc1..e85c2e7e824 100644 --- a/drivers/net/ethernet/smsc/smc9194.c +++ b/drivers/net/ethernet/smsc/smc9194.c @@ -1223,9 +1223,7 @@ static void smc_rcv(struct net_device *dev)  			dev->stats.multicast++;  		skb = netdev_alloc_skb(dev, packet_length + 5); -  		if ( skb == NULL ) { -			printk(KERN_NOTICE CARDNAME ": Low memory, packet dropped.\n");  			dev->stats.rx_dropped++;  			goto done;  		} diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 591650a8de3..dfbf978315d 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -465,8 +465,6 @@ static inline void  smc_rcv(struct net_device *dev)  		 */  		skb = netdev_alloc_skb(dev, packet_len);  		if (unlikely(skb == NULL)) { -			printk(KERN_NOTICE "%s: Low memory, packet dropped.\n", -				dev->name);  			SMC_WAIT_MMU_BUSY(lp);  			SMC_SET_MMU_CMD(lp, MC_RELEASE);  			dev->stats.rx_dropped++; diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index da5cc9a3b34..48e2b99bec5 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2115,7 +2115,7 @@ static int smsc911x_init(struct net_device *dev)  	spin_lock_init(&pdata->dev_lock);  	spin_lock_init(&pdata->mac_lock); -	if (pdata->ioaddr == 0) { +	if (pdata->ioaddr == NULL) {  		SMSC_WARN(pdata, probe, "pdata->ioaddr: 0x00000000");  		return -ENODEV;  	} diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index d457fa2d750..ffa5c4ad121 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c @@ -848,10 +848,8 @@ static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index)  	BUG_ON(pd->rx_buffers[index].skb);  	BUG_ON(pd->rx_buffers[index].mapping); -	if (unlikely(!skb)) { -		smsc_warn(RX_ERR, "Failed to allocate new skb!"); +	if (unlikely(!skb))  		return -ENOMEM; -	}  	mapping = pci_map_single(pd->pdev, skb_tail_pointer(skb),  				 PKT_BUF_SZ, PCI_DMA_FROMDEVICE);  |