Commit b55932bc authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: z85230: replace comparison to NULL with "!skb"

According to the chackpatch.pl, comparison to NULL could
be written "!skb".
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e07a1f9c
...@@ -851,12 +851,12 @@ int z8530_sync_dma_open(struct net_device *dev, struct z8530_channel *c) ...@@ -851,12 +851,12 @@ int z8530_sync_dma_open(struct net_device *dev, struct z8530_channel *c)
return -EMSGSIZE; return -EMSGSIZE;
c->rx_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA); c->rx_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
if(c->rx_buf[0]==NULL) if (!c->rx_buf[0])
return -ENOBUFS; return -ENOBUFS;
c->rx_buf[1]=c->rx_buf[0]+PAGE_SIZE/2; c->rx_buf[1]=c->rx_buf[0]+PAGE_SIZE/2;
c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA); c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
if(c->tx_dma_buf[0]==NULL) if (!c->tx_dma_buf[0])
{ {
free_page((unsigned long)c->rx_buf[0]); free_page((unsigned long)c->rx_buf[0]);
c->rx_buf[0]=NULL; c->rx_buf[0]=NULL;
...@@ -1039,7 +1039,7 @@ int z8530_sync_txdma_open(struct net_device *dev, struct z8530_channel *c) ...@@ -1039,7 +1039,7 @@ int z8530_sync_txdma_open(struct net_device *dev, struct z8530_channel *c)
return -EMSGSIZE; return -EMSGSIZE;
c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA); c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
if(c->tx_dma_buf[0]==NULL) if (!c->tx_dma_buf[0])
return -ENOBUFS; return -ENOBUFS;
c->tx_dma_buf[1] = c->tx_dma_buf[0] + PAGE_SIZE/2; c->tx_dma_buf[1] = c->tx_dma_buf[0] + PAGE_SIZE/2;
...@@ -1397,7 +1397,7 @@ static void z8530_tx_begin(struct z8530_channel *c) ...@@ -1397,7 +1397,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
c->tx_next_skb=NULL; c->tx_next_skb=NULL;
c->tx_ptr=c->tx_next_ptr; c->tx_ptr=c->tx_next_ptr;
if(c->tx_skb==NULL) if (!c->tx_skb)
{ {
/* Idle on */ /* Idle on */
if(c->dma_tx) if(c->dma_tx)
...@@ -1486,7 +1486,7 @@ static void z8530_tx_done(struct z8530_channel *c) ...@@ -1486,7 +1486,7 @@ static void z8530_tx_done(struct z8530_channel *c)
struct sk_buff *skb; struct sk_buff *skb;
/* Actually this can happen.*/ /* Actually this can happen.*/
if (c->tx_skb == NULL) if (!c->tx_skb)
return; return;
skb = c->tx_skb; skb = c->tx_skb;
...@@ -1589,7 +1589,7 @@ static void z8530_rx_done(struct z8530_channel *c) ...@@ -1589,7 +1589,7 @@ static void z8530_rx_done(struct z8530_channel *c)
*/ */
skb = dev_alloc_skb(ct); skb = dev_alloc_skb(ct);
if (skb == NULL) { if (!skb) {
c->netdevice->stats.rx_dropped++; c->netdevice->stats.rx_dropped++;
netdev_warn(c->netdevice, "Memory squeeze\n"); netdev_warn(c->netdevice, "Memory squeeze\n");
} else { } else {
...@@ -1630,7 +1630,7 @@ static void z8530_rx_done(struct z8530_channel *c) ...@@ -1630,7 +1630,7 @@ static void z8530_rx_done(struct z8530_channel *c)
RT_UNLOCK; RT_UNLOCK;
c->skb2 = dev_alloc_skb(c->mtu); c->skb2 = dev_alloc_skb(c->mtu);
if (c->skb2 == NULL) if (!c->skb2)
netdev_warn(c->netdevice, "memory squeeze\n"); netdev_warn(c->netdevice, "memory squeeze\n");
else else
skb_put(c->skb2, c->mtu); skb_put(c->skb2, c->mtu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment