summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-12-06 13:16:03 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-06 21:46:56 -0500
commitc947164698cd425103d4e332e67f1dc5d85e826d (patch)
treec8f90dae098375c65a7cce6e5f45f530add9d6ee /drivers/net/irda
parent47fda1a7669969c2a43d5918eb5e355973820363 (diff)
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.c28
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,
168 * Allocate new instance of the driver 168 * Allocate new instance of the driver
169 */ 169 */
170 dev = alloc_irdadev(sizeof(struct w83977af_ir)); 170 dev = alloc_irdadev(sizeof(struct w83977af_ir));
171 if (dev == NULL) { 171 if (!dev) {
172 printk(KERN_ERR "IrDA: Can't allocate memory for " 172 printk(KERN_ERR "IrDA: Can't allocate memory for "
173 "IrDA control block!\n"); 173 "IrDA control block!\n");
174 err = -ENOMEM; 174 err = -ENOMEM;
@@ -206,7 +206,7 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
206 self->rx_buff.head = 206 self->rx_buff.head =
207 dma_zalloc_coherent(NULL, self->rx_buff.truesize, 207 dma_zalloc_coherent(NULL, self->rx_buff.truesize,
208 &self->rx_buff_dma, GFP_KERNEL); 208 &self->rx_buff_dma, GFP_KERNEL);
209 if (self->rx_buff.head == NULL) { 209 if (!self->rx_buff.head) {
210 err = -ENOMEM; 210 err = -ENOMEM;
211 goto err_out1; 211 goto err_out1;
212 } 212 }
@@ -214,7 +214,7 @@ static int w83977af_open(int i, unsigned int iobase, unsigned int irq,
214 self->tx_buff.head = 214 self->tx_buff.head =
215 dma_zalloc_coherent(NULL, self->tx_buff.truesize, 215 dma_zalloc_coherent(NULL, self->tx_buff.truesize,
216 &self->tx_buff_dma, GFP_KERNEL); 216 &self->tx_buff_dma, GFP_KERNEL);
217 if (self->tx_buff.head == NULL) { 217 if (!self->tx_buff.head) {
218 err = -ENOMEM; 218 err = -ENOMEM;
219 goto err_out2; 219 goto err_out2;
220 } 220 }
@@ -629,7 +629,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
629 629
630 pr_debug("%s(%ld)\n", __func__, jiffies); 630 pr_debug("%s(%ld)\n", __func__, jiffies);
631 631
632 IRDA_ASSERT(self != NULL, return;); 632 IRDA_ASSERT(self, return;);
633 633
634 iobase = self->io.fir_base; 634 iobase = self->io.fir_base;
635 635
@@ -680,7 +680,7 @@ static int w83977af_dma_receive(struct w83977af_ir *self)
680 unsigned long flags; 680 unsigned long flags;
681 __u8 hcr; 681 __u8 hcr;
682#endif 682#endif
683 IRDA_ASSERT(self != NULL, return -1;); 683 IRDA_ASSERT(self, return -1;);
684 684
685 pr_debug("%s\n", __func__); 685 pr_debug("%s\n", __func__);
686 686
@@ -818,7 +818,7 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self)
818 } 818 }
819 819
820 skb = dev_alloc_skb(len + 1); 820 skb = dev_alloc_skb(len + 1);
821 if (skb == NULL) { 821 if (!skb) {
822 printk(KERN_INFO 822 printk(KERN_INFO
823 "%s(), memory squeeze, dropping frame.\n", __func__); 823 "%s(), memory squeeze, dropping frame.\n", __func__);
824 /* Restore set register */ 824 /* Restore set register */
@@ -870,7 +870,7 @@ static void w83977af_pio_receive(struct w83977af_ir *self)
870 __u8 byte = 0x00; 870 __u8 byte = 0x00;
871 int iobase; 871 int iobase;
872 872
873 IRDA_ASSERT(self != NULL, return;); 873 IRDA_ASSERT(self, return;);
874 874
875 iobase = self->io.fir_base; 875 iobase = self->io.fir_base;
876 876
@@ -1081,7 +1081,7 @@ static int w83977af_is_receiving(struct w83977af_ir *self)
1081 int iobase; 1081 int iobase;
1082 __u8 set; 1082 __u8 set;
1083 1083
1084 IRDA_ASSERT(self != NULL, return FALSE;); 1084 IRDA_ASSERT(self, return FALSE;);
1085 1085
1086 if (self->io.speed > 115200) { 1086 if (self->io.speed > 115200) {
1087 iobase = self->io.fir_base; 1087 iobase = self->io.fir_base;
@@ -1113,10 +1113,10 @@ static int w83977af_net_open(struct net_device *dev)
1113 char hwname[32]; 1113 char hwname[32];
1114 __u8 set; 1114 __u8 set;
1115 1115
1116 IRDA_ASSERT(dev != NULL, return -1;); 1116 IRDA_ASSERT(dev, return -1;);
1117 self = netdev_priv(dev); 1117 self = netdev_priv(dev);
1118 1118
1119 IRDA_ASSERT(self != NULL, return 0;); 1119 IRDA_ASSERT(self, return 0;);
1120 1120
1121 iobase = self->io.fir_base; 1121 iobase = self->io.fir_base;
1122 1122
@@ -1174,11 +1174,11 @@ static int w83977af_net_close(struct net_device *dev)
1174 int iobase; 1174 int iobase;
1175 __u8 set; 1175 __u8 set;
1176 1176
1177 IRDA_ASSERT(dev != NULL, return -1;); 1177 IRDA_ASSERT(dev, return -1;);
1178 1178
1179 self = netdev_priv(dev); 1179 self = netdev_priv(dev);
1180 1180
1181 IRDA_ASSERT(self != NULL, return 0;); 1181 IRDA_ASSERT(self, return 0;);
1182 1182
1183 iobase = self->io.fir_base; 1183 iobase = self->io.fir_base;
1184 1184
@@ -1221,11 +1221,11 @@ static int w83977af_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1221 unsigned long flags; 1221 unsigned long flags;
1222 int ret = 0; 1222 int ret = 0;
1223 1223
1224 IRDA_ASSERT(dev != NULL, return -1;); 1224 IRDA_ASSERT(dev, return -1;);
1225 1225
1226 self = netdev_priv(dev); 1226 self = netdev_priv(dev);
1227 1227
1228 IRDA_ASSERT(self != NULL, return -1;); 1228 IRDA_ASSERT(self, return -1;);
1229 1229
1230 pr_debug("%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd); 1230 pr_debug("%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);
1231 1231