[PATCH 1/2] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay

[PATCH 1/2] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay

[Nizam Haider]

removed heckpatch warning

Signed-off-by: Nizam Haider <nijamh@cdac.in>
---
 drivers/staging/dgnc/dgnc_neo.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c
index 8106f52..cf5bfc7 100644
--- a/drivers/staging/dgnc/dgnc_neo.c
+++ b/drivers/staging/dgnc/dgnc_neo.c
@@ -1335,7 +1335,7 @@ static void neo_flush_uart_write(struct channel_t *ch)
 		/* Check to see if the UART feels it completely flushed the FIFO. */
 		tmp = readb(&ch->ch_neo_uart->isr_fcr);
 		if (tmp & 4)
-			udelay(10);
+			usleep_range(10, 50);
 		else
 			break;
 	}
@@ -1363,7 +1363,7 @@ static void neo_flush_uart_read(struct channel_t *ch)
 		/* Check to see if the UART feels it completely flushed the FIFO. */
 		tmp = readb(&ch->ch_neo_uart->isr_fcr);
 		if (tmp & 2)
-			udelay(10);
+			usleep_range(10, 50);
 		else
 			break;
 	}
@@ -1588,7 +1588,7 @@ static void neo_assert_modem_signals(struct channel_t *ch)
 	neo_pci_posting_flush(ch->ch_bd);
 
 	/* Give time for the UART to actually raise/drop the signals */
-	udelay(10);
+	usleep_range(10, 50);
 }
 
 static void neo_send_start_character(struct channel_t *ch)
@@ -1600,7 +1600,7 @@ static void neo_send_start_character(struct channel_t *ch)
 		ch->ch_xon_sends++;
 		writeb(ch->ch_startc, &ch->ch_neo_uart->txrx);
 		neo_pci_posting_flush(ch->ch_bd);
-		udelay(10);
+		usleep_range(10, 50);
 	}
 }
 
@@ -1613,7 +1613,7 @@ static void neo_send_stop_character(struct channel_t *ch)
 		ch->ch_xoff_sends++;
 		writeb(ch->ch_stopc, &ch->ch_neo_uart->txrx);
 		neo_pci_posting_flush(ch->ch_bd);
-		udelay(10);
+		usleep_range(10, 50);
 	}
 }
 
-- 
1.8.1.4

[PATCH 2/2] Staging: dgnc: dgnc_neo.c: checkpatch cleanup

[Nizam Haider]

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

Re: [PATCH 2/2] Staging: dgnc: dgnc_neo.c: checkpatch cleanup

[Sudip Mukherjee]

On Fri, Nov 13, 2015 at 04:48:11PM +0530, Nizam Haider wrote:
> 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

These are three different types of changes. Please split them in three
different patches.
CHECK: Logical continuations should be on the previous line
CHECK: braces {} should be used on all arms of this statement
CHECK: spaces preferred around that ' '

regards
sudip

Re: [PATCH 1/2] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay

[Greg KH]

On Fri, Nov 13, 2015 at 04:48:10PM +0530, Nizam Haider wrote:
> removed heckpatch warning

heckpatch?  And what warning is that?