From: Nizam Haider <nizamhaider786@gmail.com>
To: lidza.louina@gmail.com
Cc: markh@compro.net, driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Nizam Haider <nizamhaider786@gmail.com>,
Nizam Haider <nijamh@cdac.in>
Subject: [PATCH 2/2] Staging: dgnc: dgnc_neo.c: checkpatch cleanup
Date: Fri, 13 Nov 2015 16:48:11 +0530 [thread overview]
Message-ID: <1447413491-17055-2-git-send-email-nizamhaider786@gmail.com> (raw)
In-Reply-To: <1447413491-17055-1-git-send-email-nizamhaider786@gmail.com>
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 <nijamh@cdac.in>
---
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
next prev parent reply other threads:[~2015-11-13 11:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-13 11:18 [PATCH 1/2] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay Nizam Haider
2015-11-13 11:18 ` Nizam Haider [this message]
2015-11-13 12:47 ` [PATCH 2/2] Staging: dgnc: dgnc_neo.c: checkpatch cleanup Sudip Mukherjee
2015-12-14 19:15 ` [PATCH 1/2] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447413491-17055-2-git-send-email-nizamhaider786@gmail.com \
--to=nizamhaider786@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=lidza.louina@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markh@compro.net \
--cc=nijamh@cdac.in \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®