Use min_t instead of min to improve type safety.
While at it, replace neo_parse_modem (hard-coded function name) with __func__.
Also fix minor styling issues, like removing redundant return statement in void function.
Signed-off-by: Mohammad Mahfooz <mohammadmahfoozpersonal@xxxxxxxxx>
---
drivers/tty/serial/jsm/jsm_neo.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 0c78f66276cd..d4451fe06d99 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -29,7 +29,7 @@ static u32 jsm_offset_table[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x8
*/
static inline void neo_pci_posting_flush(struct jsm_board *bd)
{
- readb(bd->re_map_membase + 0x8D);
+ readb(bd->re_map_membase + 0x8D);
}
static void neo_set_cts_flow_control(struct jsm_channel *ch)
@@ -350,7 +350,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
* IBM pSeries platform.
* 15 bytes max appears to be the magic number.
*/
- n = min((u32) n, (u32) 12);
+ n = min_t(u32, n, 12);
/*
* Since we are grabbing the linestatus register, which
@@ -433,7 +433,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
/*
* If our queue is full, we have no choice but to drop some data.
* The assumption is that HWFLOW or SWFLOW should have stopped
- * things way way before we got to this point.
+ * things way before we got to this point.
*
* I decided that I wanted to ditch the oldest data first,
* I hope thats okay with everyone? Yes? Good.
@@ -560,8 +560,8 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
u8 msignals = signals;
jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
- "neo_parse_modem: port: %d msignals: %x\n",
- ch->ch_portnum, msignals);
+ "%s: port: %d msignals: %x\n",
+ __func__, ch->ch_portnum, msignals);
/* Scrub off lower bits. They signify delta's, which I don't care about */
/* Keep DDCD and DDSR though */
@@ -592,7 +592,7 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
ch->ch_mistat &= ~UART_MSR_CTS;
jsm_dbg(MSIGS, &ch->ch_bd->pci_dev,
- "Port: %d DTR: %d RTS: %d CTS: %d DSR: %d " "RI: %d CD: %d\n",
+ "Port: %d DTR: %d RTS: %d CTS: %d DSR: %d RI: %d CD: %d\n",
ch->ch_portnum,
!!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_DTR),
!!((ch->ch_mistat | ch->ch_mostat) & UART_MCR_RTS),
@@ -770,9 +770,9 @@ static void neo_parse_isr(struct jsm_board *brd, u32 port)
spin_lock_irqsave(&ch->ch_lock, lock_flags);
if (cause == UART_17158_XON_DETECT) {
/* Is output stopped right now, if so, resume it */
- if (brd->channels[port]->ch_flags & CH_STOP) {
+ if (brd->channels[port]->ch_flags & CH_STOP)
ch->ch_flags &= ~(CH_STOP);
- }
+
jsm_dbg(INTR, &ch->ch_bd->pci_dev,
"Port %d. XON detected in incoming data\n",
port);
@@ -1067,7 +1067,6 @@ static void neo_param(struct jsm_channel *ch)
/* Get current status of the modem signals now */
neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
- return;
}
/*
@@ -1147,7 +1146,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
case UART_17158_RXRDY_TIMEOUT:
/*
* RXRDY Time-out is cleared by reading data in the
- * RX FIFO until it falls below the trigger level.
+ * RX FIFO until it falls below the trigger level.
*/
/* Verify the port is in range. */
--
2.34.1
