Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932234AbbKMLTX (ORCPT ); Fri, 13 Nov 2015 06:19:23 -0500 Received: from mail-pa0-f65.google.com ([209.85.220.65]:36065 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754704AbbKMLSr (ORCPT ); Fri, 13 Nov 2015 06:18:47 -0500 From: Nizam Haider To: lidza.louina@gmail.com Cc: markh@compro.net, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Nizam Haider , Nizam Haider Subject: [PATCH 2/2] Staging: dgnc: dgnc_neo.c: checkpatch cleanup Date: Fri, 13 Nov 2015 16:48:11 +0530 Message-Id: <1447413491-17055-2-git-send-email-nizamhaider786@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1447413491-17055-1-git-send-email-nizamhaider786@gmail.com> References: <1447413491-17055-1-git-send-email-nizamhaider786@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3220 Lines: 80 This patch fixes several warning during checkpatch 355: CHECK: Logical continuations should be on the previous line 1111: CHECK: braces {} should be used on all arms of this statement 1631: CHECK: spaces preferred around that '|' (ctx:VxV) 1782: CHECK: spaces preferred around that '*' (ctx:VxV) 1783: CHECK: spaces preferred around that '*' (ctx:VxV) 1783: CHECK: spaces preferred around that '+' (ctx:VxV) 1787: CHECK: Logical continuations should be on the previous line 1788: CHECK: Logical continuations should be on the previous line Signed-off-by: Nizam Haider --- drivers/staging/dgnc/dgnc_neo.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c index cf5bfc7..f7d83d3 100644 --- a/drivers/staging/dgnc/dgnc_neo.c +++ b/drivers/staging/dgnc/dgnc_neo.c @@ -351,8 +351,8 @@ static inline void neo_clear_break(struct channel_t *ch, int force) /* Turn break off, and unset some variables */ if (ch->ch_flags & CH_BREAK_SENDING) { - if (time_after_eq(jiffies, ch->ch_stop_sending_break) - || force) { + if (time_after_eq(jiffies, ch->ch_stop_sending_break) || + force) { unsigned char temp = readb(&ch->ch_neo_uart->lcr); writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr); @@ -1108,9 +1108,10 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch) * On the other hand, if the UART IS in FIFO mode, then ask * the UART to give us an approximation of data it has RX'ed. */ - if (!(ch->ch_flags & CH_FIFO_ENABLED)) + if (!(ch->ch_flags & CH_FIFO_ENABLED)) { total = 0; - else { + } + else { total = readb(&ch->ch_neo_uart->rfifo); /* @@ -1628,7 +1629,7 @@ static void neo_uart_init(struct channel_t *ch) /* Clear out UART and FIFO */ readb(&ch->ch_neo_uart->txrx); - writeb((UART_FCR_ENABLE_FIFO|UART_FCR_CLEAR_RCVR|UART_FCR_CLEAR_XMIT), &ch->ch_neo_uart->isr_fcr); + writeb((UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), &ch->ch_neo_uart->isr_fcr); readb(&ch->ch_neo_uart->lsr); readb(&ch->ch_neo_uart->msr); @@ -1779,13 +1780,13 @@ static void neo_vpd(struct dgnc_board *brd) /* Store the VPD into our buffer */ for (i = 0; i < NEO_VPD_IMAGESIZE; i++) { a = neo_read_eeprom(brd->re_map_membase, i); - brd->vpd[i*2] = a & 0xff; - brd->vpd[(i*2)+1] = (a >> 8) & 0xff; + brd->vpd[i * 2] = a & 0xff; + brd->vpd[(i * 2) + 1] = (a >> 8) & 0xff; } - if (((brd->vpd[0x08] != 0x82) /* long resource name tag */ - && (brd->vpd[0x10] != 0x82)) /* long resource name tag (PCI-66 files)*/ - || (brd->vpd[0x7F] != 0x78)) { /* small resource end tag */ + if (((brd->vpd[0x08] != 0x82) && /* long resource name tag */ + (brd->vpd[0x10] != 0x82)) || /* long resource name tag (PCI-66 files)*/ + (brd->vpd[0x7F] != 0x78)) { /* small resource end tag */ memset(brd->vpd, '\0', NEO_VPD_IMAGESIZE); } else { -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/