diff options
| author | Joe Perches <joe@perches.com> | 2016-12-06 21:16:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-07 05:46:56 +0300 |
| commit | c947164698cd425103d4e332e67f1dc5d85e826d (patch) | |
| tree | c8f90dae098375c65a7cce6e5f45f530add9d6ee /drivers/net/irda | |
| parent | 47fda1a7669969c2a43d5918eb5e355973820363 (diff) | |
| download | linux-c947164698cd425103d4e332e67f1dc5d85e826d.tar.xz | |
irda: w83977af_ir: Neaten pointer comparisons
Convert pointer comparisons to NULL.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/w83977af_ir.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index e30cbf005320..92f1525b0570 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -168,7 +168,7 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq, * Allocate new instance of the driver */ dev = alloc_irdadev(sizeof(struct w83977af_ir)); - if (dev == NULL) { + if (!dev) { printk(KERN_ERR "IrDA: Can't allocate memory for " "IrDA control block!\n"); err = -ENOMEM; @@ -206,7 +206,7 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq, self->rx_buff.head = dma_zalloc_coherent(NULL, self->rx_buff.truesize, &self->rx_buff_dma, GFP_KERNEL); - if (self->rx_buff.head == NULL) { + if (!self->rx_buff.head) { err = -ENOMEM; goto err_out1; } @@ -214,7 +214,7 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq, self->tx_buff.head = dma_zalloc_coherent(NULL, self->tx_buff.truesize, &self->tx_buff_dma, GFP_KERNEL); - if (self->tx_buff.head == NULL) { + if (!self->tx_buff.head) { err = -ENOMEM; goto err_out2; } @@ -629,7 +629,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) pr_debug("%s(%ld)\n", __func__, jiffies); - IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self, return;); iobase = self->io.fir_base; @@ -680,7 +680,7 @@ static int w83977af_dma_receive(struct w83977af_ir *self) unsigned long flags; __u8 hcr; #endif - IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(self, return -1;); pr_debug("%s\n", __func__); @@ -818,7 +818,7 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self) } skb = dev_alloc_skb(len + 1); - if (skb == NULL) { + if (!skb) { printk(KERN_INFO "%s(), memory squeeze, dropping frame.\n", __func__); /* Restore set register */ @@ -870,7 +870,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self) __u8 byte = 0x00; int iobase; - IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self, return;); iobase = self->io.fir_base; @@ -1081,7 +1081,7 @@ static int w83977af_is_receiving(struct w83977af_ir *self) int iobase; __u8 set; - IRDA_ASSERT(self != NULL, return FALSE;); + IRDA_ASSERT(self, return FALSE;); if (self->io.speed > 115200) { iobase = self->io.fir_base; @@ -1113,10 +1113,10 @@ static int w83977af_net_open(struct net_device *dev) char hwname[32]; __u8 set; - IRDA_ASSERT(dev != NULL, return -1;); + IRDA_ASSERT(dev, return -1;); self = netdev_priv(dev); - IRDA_ASSERT(self != NULL, return 0;); + IRDA_ASSERT(self, return 0;); iobase = self->io.fir_base; @@ -1174,11 +1174,11 @@ static int w83977af_net_close(struct net_device *dev) int iobase; __u8 set; - IRDA_ASSERT(dev != NULL, return -1;); + IRDA_ASSERT(dev, return -1;); self = netdev_priv(dev); - IRDA_ASSERT(self != NULL, return 0;); + IRDA_ASSERT(self, return 0;); iobase = self->io.fir_base; @@ -1221,11 +1221,11 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) unsigned long flags; int ret = 0; - IRDA_ASSERT(dev != NULL, return -1;); + IRDA_ASSERT(dev, return -1;); self = netdev_priv(dev); - IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(self, return -1;); pr_debug("%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd); |