From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932248AbcLFSRY (ORCPT ); Tue, 6 Dec 2016 13:17:24 -0500 Received: from smtprelay0164.hostedemail.com ([216.40.44.164]:40577 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932129AbcLFSQS (ORCPT ); Tue, 6 Dec 2016 13:16:18 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1345:1359:1437:1534:1543:1711:1730:1747:1777:1792:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3355:3865:3866:3867:4321:4605:5007:6119:6261:8531:9040:10004:10848:11026:11232:11658:11914:12043:12296:12438:12555:12986:13972:14181:14394:14721:21080:21433:30029:30054:30069,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: key11_199489d1fdc02 X-Filterd-Recvd-Size: 4526 From: Joe Perches To: Samuel Ortiz Cc: Arnd Bergmann , Sergei Shtylyov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/7] irda: w83977af_ir: Neaten pointer comparisons Date: Tue, 6 Dec 2016 10:16:03 -0800 Message-Id: <6bf80d64e6d95d652d679bd682e3149220a9ad11.1481047792.git.joe@perches.com> X-Mailer: git-send-email 2.10.0.rc2.1.g053435c In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert pointer comparisons to NULL. Signed-off-by: Joe Perches --- drivers/net/irda/w83977af_ir.c | 28 ++++++++++++++-------------- 1 file 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); -- 2.10.0.rc2.1.g053435c