From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932223AbcLFSRW (ORCPT ); Tue, 6 Dec 2016 13:17:22 -0500 Received: from smtprelay0060.hostedemail.com ([216.40.44.60]:40584 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932133AbcLFSQT (ORCPT ); Tue, 6 Dec 2016 13:16:19 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:355:379:541:800:960:966:968:973:981:988:989:1260:1345:1359:1437:1534:1542:1711:1730:1747:1777:1792:2194:2196:2199:2200:2393:2559:2562:2904:3138:3139:3140:3141:3142:3354:3866:3867:3868:3870:3872:4250:4385:5007:6119:6261:7903:9040:9592:10004:10848:11026:11473:11658:11914:12043:12217:12296:12438:12555:13972:14096:14181:14394:14721:21080:21324:30007:30045:30046:30054:30069:30070,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: shirt57_19d2d5d6e5006 X-Filterd-Recvd-Size: 3351 From: Joe Perches To: Samuel Ortiz Cc: Arnd Bergmann , Sergei Shtylyov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/7] irda: w83977af_ir: Use the common brace style Date: Tue, 6 Dec 2016 10:16:04 -0800 Message-Id: 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 Add braces where appropriate and remove an unnecessary else. Signed-off-by: Joe Perches --- drivers/net/irda/w83977af_ir.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 92f1525b0570..5d5ec8938e2b 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -462,8 +462,9 @@ static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed) if (speed > PIO_MAX_SPEED) { outb(ICR_EFSFI, iobase + ICR); w83977af_dma_receive(self); - } else + } else { outb(ICR_ERBRI, iobase + ICR); + } /* Restore SSR */ outb(set, iobase + SSR); @@ -502,8 +503,8 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, w83977af_change_speed(self, speed); dev_kfree_skb(skb); return NETDEV_TX_OK; - } else - self->new_speed = speed; + } + self->new_speed = speed; } /* Save current set */ @@ -649,8 +650,9 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) /* Clear bit, by writing 1 to it */ outb(AUDR_UNDR, iobase + AUDR); - } else + } else { self->netdev->stats.tx_packets++; + } if (self->new_speed) { w83977af_change_speed(self, self->new_speed); @@ -813,9 +815,8 @@ static int w83977af_dma_receive_complete(struct w83977af_ir *self) } else { /* Check if we have transferred all data to memory */ switch_bank(iobase, SET0); - if (inb(iobase + USR) & USR_RDR) { + if (inb(iobase + USR) & USR_RDR) udelay(80); /* Should be enough!? */ - } skb = dev_alloc_skb(len + 1); if (!skb) { @@ -969,7 +970,6 @@ static __u8 w83977af_fir_interrupt(struct w83977af_ir *self, int isr) /* End of frame detected in FIFO */ if (isr & (ISR_FEND_I | ISR_FSF_I)) { if (w83977af_dma_receive_complete(self)) { - /* Wait for next status FIFO interrupt */ new_icr |= ICR_EFSFI; } else { @@ -1094,8 +1094,9 @@ static int w83977af_is_receiving(struct w83977af_ir *self) status = TRUE; } outb(set, iobase + SSR); - } else + } else { status = (self->rx_buff.state != OUTSIDE_FRAME); + } return status; } @@ -1141,8 +1142,9 @@ static int w83977af_net_open(struct net_device *dev) if (self->io.speed > 115200) { outb(ICR_EFSFI, iobase + ICR); w83977af_dma_receive(self); - } else + } else { outb(ICR_ERBRI, iobase + ICR); + } /* Restore bank register */ outb(set, iobase + SSR); -- 2.10.0.rc2.1.g053435c