staging: dgnc: Fix warnings in dgnc driver
cover staging: dgnc: Fix warnings in dgnc driver
This patch-set fixes checkpatch.pl warnings in dgnc driver
Rehas Sachdeva (4):
staging: dgnc: Add spaces around '|' and '<<'
staging: dgnc: Avoid multiple blank lines
staging: dgnc: Fix block comment style
staging: dgnc: Break line after boolean operator
drivers/staging/dgnc/dgnc_driver.h | 8 -------- drivers/staging/dgnc/dgnc_neo.h | 1 - drivers/staging/dgnc/dgnc_pci.h | 1 - drivers/staging/dgnc/dgnc_tty.c | 28 ++++++++++++---------------- drivers/staging/dgnc/digi.h | 32 ++++++++++++++++---------------- 5 files changed, 28 insertions(+), 42 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/4 staging: dgnc: Add spaces around '|' and '<<'
One space on either side of binary and ternary operators is preferred. This patch fixes the related checkpatch.pl warnings.
Signed-off-by Rehas Sachdeva <[email protected]>
--- drivers/staging/dgnc/dgnc_tty.c | 12 ++++++------ drivers/staging/dgnc/digi.h | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/dgnc/dgnc_tty.c +6 -6
@@ -2520,12 +2520,12 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)/* Flush UARTs transmit FIFO */ ch->ch_bd->bd_ops->flush_uart_write (ch); -if (ch->ch_tun.un_flags & (UN_LOW |UN_EMPTY )) { - ch->ch_tun.un_flags &= ~(UN_LOW |UN_EMPTY ); +if (ch->ch_tun.un_flags & (UN_LOW |UN_EMPTY )) { + ch->ch_tun.un_flags &= ~(UN_LOW |UN_EMPTY );wake_up_interruptible (&ch->ch_tun.un_flags_wait); } -if (ch->ch_pun.un_flags & (UN_LOW |UN_EMPTY )) { - ch->ch_pun.un_flags &= ~(UN_LOW |UN_EMPTY ); +if (ch->ch_pun.un_flags & (UN_LOW |UN_EMPTY )) { + ch->ch_pun.un_flags &= ~(UN_LOW |UN_EMPTY );wake_up_interruptible (&ch->ch_pun.un_flags_wait); }
@@ -2719,13 +2719,13 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,if (ch->ch_tun.un_flags & (UN_LOW |UN_EMPTY )) { ch->ch_tun.un_flags &= - ~(UN_LOW |UN_EMPTY ); + ~(UN_LOW |UN_EMPTY );wake_up_interruptible (&ch->ch_tun.un_flags_wait); }if (ch->ch_pun.un_flags & (UN_LOW |UN_EMPTY )) { ch->ch_pun.un_flags &= - ~(UN_LOW |UN_EMPTY ); + ~(UN_LOW |UN_EMPTY );wake_up_interruptible (&ch->ch_pun.un_flags_wait); } }
drivers/staging/dgnc/digi.h +16 -16
@@ -31,21 +31,21 @@#endif #if !defined(TIOCMSET ) -#define TIOCMSET (('d'<<8) | 252)/* set modem ctrl state */ -#define TIOCMGET (('d'<<8) | 253)/* set modem ctrl state */ +#define TIOCMSET (('d' << 8) | 252)/* set modem ctrl state */ +#define TIOCMGET (('d' << 8) | 253)/* set modem ctrl state */ #endif #if !defined(TIOCMBIC ) -#define TIOCMBIC (('d'<<8) | 254)/* set modem ctrl state */ -#define TIOCMBIS (('d'<<8) | 255)/* set modem ctrl state */ +#define TIOCMBIC (('d' << 8) | 254)/* set modem ctrl state */ +#define TIOCMBIS (('d' << 8) | 255)/* set modem ctrl state */ #endif -#define DIGI_GETA (('e'<<8) | 94)/* Read params */ -#define DIGI_SETA (('e'<<8) | 95)/* Set params */ -#define DIGI_SETAW (('e'<<8) | 96)/* Drain & set params */ -#define DIGI_SETAF (('e'<<8) | 97)/* Drain, flush & set params */ -#define DIGI_GET_NI_INFO (('d'<<8) | 250)/* Non-intelligent state info */ -#define DIGI_LOOPBACK (('d'<<8) | 252)/* +#define DIGI_GETA (('e' << 8) | 94)/* Read params */ +#define DIGI_SETA (('e' << 8) | 95)/* Set params */ +#define DIGI_SETAW (('e' << 8) | 96)/* Drain & set params */ +#define DIGI_SETAF (('e' << 8) | 97)/* Drain, flush & set params */ +#define DIGI_GET_NI_INFO (('d' << 8) | 250)/* Non-intelligent state info */ +#define DIGI_LOOPBACK (('d' << 8) | 252)/* * Enable/disable UART * internal loopback */
@@ -85,7 +85,7 @@ struct digi_dinfo {char dinfo_version[16 ];/* driver version */ }; -#define DIGI_GETDD (('d'<<8) | 248)/* get driver info */ +#define DIGI_GETDD (('d' << 8) | 248)/* get driver info */ /************************************************************************ * Structure used with ioctl commands for per-board information
@@ -105,7 +105,7 @@ struct digi_info {char info_reserved[7 ];/* for future expansion */ }; -#define DIGI_GETBD (('d'<<8) | 249)/* get board info */ +#define DIGI_GETBD (('d' << 8) | 249)/* get board info */ struct digi_getbuffer /* Struct for holding buffer use counts */ {
@@ -133,10 +133,10 @@ struct digi_getcounter {#define DIGI_SETCUSTOMBAUD _IOW('e', 106, int)/* Set integer baud rate */ #define DIGI_GETCUSTOMBAUD _IOR('e', 107, int)/* Get integer baud rate */ -#define DIGI_REALPORT_GETBUFFERS (('e'<<8) | 108) -#define DIGI_REALPORT_SENDIMMEDIATE (('e'<<8) | 109) -#define DIGI_REALPORT_GETCOUNTERS (('e'<<8) | 110) -#define DIGI_REALPORT_GETEVENTS (('e'<<8) | 111) +#define DIGI_REALPORT_GETBUFFERS (('e' << 8) | 108) +#define DIGI_REALPORT_SENDIMMEDIATE (('e' << 8) | 109) +#define DIGI_REALPORT_GETCOUNTERS (('e' << 8) | 110) +#define DIGI_REALPORT_GETEVENTS (('e' << 8) | 111)#define EV_OPU 0x0001/* !<Output paused by client */ #define EV_OPS 0x0002/* !<Output paused by reqular sw flowctrl */
Signature · 1 line
2.1.4
PATCH 2/4 staging: dgnc: Avoid multiple blank lines
In reply to Rehas SachdevaThis patch fixes the checkpatch.pl warnings regarding multiple blank lines as single blank line is the preferred coding style.
Signed-off-by Rehas Sachdeva <[email protected]>
--- drivers/staging/dgnc/dgnc_driver.h | 8 -------- drivers/staging/dgnc/dgnc_neo.h | 1 - drivers/staging/dgnc/dgnc_pci.h | 1 - 3 files changed, 10 deletions(-)
drivers/staging/dgnc/dgnc_driver.h +0 -8
@@ -88,7 +88,6 @@#define _POSIX_VDISABLE '\0'#endif -/* * All the possible states the driver can be while being loaded. */
@@ -106,7 +105,6 @@ enum { BOARD_READY }; -/************************************************************************* * * Structures and closely related defines.
@@ -145,7 +143,6 @@ struct board_ops {************************************************************************/ #define BD_IS_PCI_EXPRESS 0x0001/* Is a PCI Express board */ -/* * Per-board information */
@@ -241,7 +238,6 @@ struct dgnc_board { }; -/************************************************************************ * Unit flag definitions for un_flags. ************************************************************************/
@@ -277,7 +273,6 @@ struct un_t {struct device *un_sysfs; }; -/************************************************************************ * Device flag definitions for ch_flags. ************************************************************************/
@@ -300,7 +295,6 @@ struct un_t {#define CH_FORCED_STOP 0x20000/* Output is forcibly stopped */ #define CH_FORCED_STOPI 0x40000/* Input is forcibly stopped */ -/* Our Read/Error/Write queue sizes */ #define RQUEUEMASK 0x1FFF/* 8 K - 1 */ #define EQUEUEMASK 0x1FFF/* 8 K - 1 */
@@ -309,7 +303,6 @@ struct un_t {#define EQUEUESIZE RQUEUESIZE#define WQUEUESIZE (WQUEUEMASK + 1) -/************************************************************************ * Channel information structure. ************************************************************************/
@@ -397,7 +390,6 @@ struct channel_t {ulong ch_intr_tx;/* Count of interrupts */ ulong ch_intr_rx;/* Count of interrupts */ -/* /proc/<board>/<channel> entries */ struct proc_dir_entry *proc_entry_pointer;struct dgnc_proc_entry *dgnc_channel_table;
drivers/staging/dgnc/dgnc_neo.h +0 -1
@@ -65,7 +65,6 @@ struct neo_uart_struct {#define NEO_EEDO 0x80/* Data Out is an Input Pin */ #define NEO_EEREG 0x8E/* offset to EEPROM control reg */ -#define NEO_VPD_IMAGESIZE 0x40/* size of image to read from EEPROM in words */ #define NEO_VPD_IMAGEBYTES (NEO_VPD_IMAGESIZE * 2)
drivers/staging/dgnc/dgnc_pci.h +0 -1
@@ -59,7 +59,6 @@#define PCI_DEVICE_NEO_EXPRESS_8RJ45_PCI_NAME "Neo 8 PCI Express RJ45"#define PCI_DEVICE_NEO_EXPRESS_4_IBM_PCI_NAME "Neo 4 PCI Express IBM" -/* Size of Memory and I/O for PCI (4 K) */ #define PCI_RAM_SIZE 0x1000
Signature · 1 line
2.1.4
PATCH 3/4 staging: dgnc: Fix block comment style
In reply to Rehas SachdevaThis patch fixes the block comment style.
1. The checkpatch.pl warning:
Block comments use a trailing */ on a separate line.
2. '====' separator is unnecessary and should not be used.
Signed-off-by Rehas Sachdeva <[email protected]>
--- drivers/staging/dgnc/dgnc_tty.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/dgnc/dgnc_tty.c +4 -8
@@ -443,15 +443,13 @@ void dgnc_tty_uninit(struct dgnc_board *brd) brd->PrintDriver.termios =NULL ; } -/*======================================================================= -* +/* * dgnc_wmove - Write data to transmit queue. * * ch - Pointer to channel structure. * buf - Pointer to characters to be moved. * n - Number of characters to move. -* -*=======================================================================*/ +*/ static void dgnc_wmove (struct channel_t *ch,char *buf,uint n) {int remain;
@@ -489,13 +487,11 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n) ch->ch_w_head = head; } -/*======================================================================= -* +/* * dgnc_input - Process received data. * * ch - Pointer to channel structure. -* -*=======================================================================*/ +*/ void dgnc_input (struct channel_t *ch) {struct dgnc_board *bd;
Signature · 1 line
2.1.4
PATCH 4/4 staging: dgnc: Break line after boolean operator
In reply to Rehas SachdevaThe preferred way to break up long math lines is to break after an arthimetic or boolean operator. This patch fixes the checkpatch.pl warning:
Logical continuations should be on the previous line.
Signed-off-by Rehas Sachdeva <[email protected]>
--- drivers/staging/dgnc/dgnc_tty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/dgnc/dgnc_tty.c +2 -2
@@ -1796,8 +1796,8 @@ static int dgnc_tty_write(struct tty_struct *tty, }/* Update printer buffer empty time. */ -if ((un->un_type ==DGNC_PRINT ) && (ch->ch_digi.digi_maxcps >0 ) - && (ch->ch_digi.digi_bufsize >0 )) { +if ((un->un_type ==DGNC_PRINT ) && (ch->ch_digi.digi_maxcps >0 ) && + (ch->ch_digi.digi_bufsize >0 )) { ch->ch_cpstime += (HZ * count) / ch->ch_digi.digi_maxcps; }
Signature · 1 line
2.1.4