Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1269029 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 1/5] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay Nizam Haider <nizamhaider786@gmail.com> - 2015-11-13 16:40 +0100
    [PATCH v2 2/5] Staging: dgnc: dgnc_neo.c: Logical continuations should be on the previous line Nizam Haider <nizamhaider786@gmail.com> - 2015-11-13 16:40 +0100

#1269029 — [PATCH v2 1/5] Staging: dgnc: dgnc_neo.c: usleep_range is preferred over udelay

Fix ceckpatch 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

--
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/

[toc] | [next] | [standalone]

#1269032 — [PATCH v2 2/5] Staging: dgnc: dgnc_neo.c: Logical continuations should be on the previous line

Fix Checkpatch warning
CHECK: Logical continuations should be on the previous line

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 cf5bfc7..51462f9 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);
@@ -1783,9 +1783,9 @@ static void neo_vpd(struct dgnc_board *brd)
 		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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web