Staging: cxt1e1: Fix line length over 80 characters in musycc.c
PATCH 2/3 Staging: cxt1e1: Fix line length over 80 characters in musycc.c
clean up checkpatch.pl warning
WARNING: Line length over 80 characters
--- drivers/staging/cxt1e1/musycc.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-)
drivers/staging/cxt1e1/musycc.c +19 -10
@@ -392,7 +392,8 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */ #endif }#endif -musycc_serv_req (pi,SR_CHANNEL_ACTIVATE |SR_RX_DIRECTION | ch->gchan); +musycc_serv_req (pi,SR_CHANNEL_ACTIVATE | +SR_RX_DIRECTION | ch->gchan); }/* check for TX restart request */
@@ -816,9 +817,10 @@ musycc_init(ci_t *ci) }/* save orig value for free's usage */ pi->regram_saved = regaddr; - pi->regram = (struct musycc_groupr *)((unsigned long )(regaddr +GROUP_BOUNDARY -1 ) & - (~(GROUP_BOUNDARY -1 )));/* this calculates -* closest boundary */ +/* this calculates closest boundary */ + pi->regram = (struct musycc_groupr *)((unsigned long )(regaddr + +GROUP_BOUNDARY -1 ) & + (~(GROUP_BOUNDARY -1 ))); }/* any board centric MUSYCC commands will use group ZERO as its "home" */
@@ -1100,7 +1102,9 @@ musycc_bh_rx_eom(mpi_t *pi, int gchan)*/ if (hdlcnum >=228 ) {if (nciProcess_RX_packet) - (*nciProcess_RX_packet) (hdlcnum, status &0x3fff , m, ch->user); + (*nciProcess_RX_packet)(hdlcnum, status & +0x3fff , m, + ch->user); } else#endif /* CONFIG_SBE_WAN256T3_NCOMM */ {
@@ -1379,7 +1383,8 @@ musycc_intr_bh_tasklet(ci_t *ci)else ci->iqd_p[headx] =__constant_cpu_to_le32 (INT_EMPTY_ENTRY ); - ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );/* insure wrapness */ +/* insure wrapness */ + ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );FLUSH_MEM_WRITE ();FLUSH_MEM_READ ();continue ;
@@ -1516,7 +1521,8 @@ musycc_intr_bh_tasklet(ci_t *ci)pr_info ("%s: RX buffer overflow [ONR] on channel %d, mode %x\n" , ci->devname, ch->channum, ch->p.chan_mode); -//musycc_dump_rxbuffer_ring (ch, 0); /* RLD DEBUG */ +/* RLD DEBUG */ +//musycc_dump_rxbuffer_ring (ch, 0); } }musycc_chan_restart (ch);
@@ -1573,7 +1579,8 @@ musycc_intr_bh_tasklet(ci_t *ci) }/* switch on err */ /* Check for interrupt lost condition */ -if ((currInt &INTRPT_ILOST_M ) && (cxt1e1_log_level >=LOG_ERROR )) +if ((currInt &INTRPT_ILOST_M ) && + (cxt1e1_log_level >=LOG_ERROR ))pr_info ("%s: Interrupt queue overflow - ILOST asserted\n" , ci->devname);/* insure wrapness */
@@ -1684,7 +1691,8 @@ musycc_del_chan(ci_t *ci, int channum) {mch_t *ch; -if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))/* sanity chk param */ +/* sanity chk param */ +if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))return ECHRNG ; ch =sd_find_chan (ci, channum);if (!ch)
@@ -1749,7 +1757,8 @@ musycc_start_xmit(ci_t *ci, int channum, void *mem_token) {pr_info ("++ start_xmt[%d]: state %x start %x full %d free %d required %d stopped %x\n" , channum, ch->state, ch->ch_start_tx, ch->tx_full, - ch->txd_free, ch->txd_required,sd_queue_stopped (ch->user)); + ch->txd_free, ch->txd_required, +sd_queue_stopped (ch->user)); }/* Determine total amount of data to be sent */
Signature · 1 line
1.7.1
This patch is ok, but here are some additional hints.
drivers/staging/cxt1e1/musycc.c musycc_bh_rx_eom(mpi_t *pi, int gchan) · line 1107
Quoted 8 lines · Daeseok Youn
drivers/staging/cxt1e1/musycc.c +3
-1@@ -1100,7 +1102,9 @@ musycc_bh_rx_eom(mpi_t *pi, int gchan)*/ if (hdlcnum >=228 ) {if (nciProcess_RX_packet) - (*nciProcess_RX_packet) (hdlcnum, status &0x3fff , m, ch->user); + (*nciProcess_RX_packet)(hdlcnum, status & +0x3fff , m, + ch->user);
It's possible to break this one up at the commas.
(*nciProcess_RX_packet)(hdlcnum, status & 0x3fff, m, ch->user);
Quoted 14 lines
drivers/staging/cxt1e1/musycc.c +2
-1} else#endif /* CONFIG_SBE_WAN256T3_NCOMM */ {@@ -1379,7 +1383,8 @@ musycc_intr_bh_tasklet(ci_t *ci)else ci->iqd_p[headx] =__constant_cpu_to_le32 (INT_EMPTY_ENTRY ); - ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );/* insure wrapness */ +/* insure wrapness */ + ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );FLUSH_MEM_WRITE ();FLUSH_MEM_READ ();continue ;
drivers/staging/cxt1e1/musycc.c musycc_intr_bh_tasklet(ci_t *ci) · line 1525
Quoted 6 lines
drivers/staging/cxt1e1/musycc.c +2
-1@@ -1516,7 +1521,8 @@ musycc_intr_bh_tasklet(ci_t *ci)pr_info ("%s: RX buffer overflow [ONR] on channel %d, mode %x\n" , ci->devname, ch->channum, ch->p.chan_mode); -//musycc_dump_rxbuffer_ring (ch, 0); /* RLD DEBUG */ +/* RLD DEBUG */ +//musycc_dump_rxbuffer_ring (ch, 0);
Just delete this commented out code.
Quoted 14 lines
drivers/staging/cxt1e1/musycc.c +2
-1} }musycc_chan_restart (ch);@@ -1573,7 +1579,8 @@ musycc_intr_bh_tasklet(ci_t *ci) }/* switch on err */ /* Check for interrupt lost condition */ -if ((currInt &INTRPT_ILOST_M ) && (cxt1e1_log_level >=LOG_ERROR )) +if ((currInt &INTRPT_ILOST_M ) && + (cxt1e1_log_level >=LOG_ERROR ))pr_info ("%s: Interrupt queue overflow - ILOST asserted\n" , ci->devname);/* insure wrapness */
drivers/staging/cxt1e1/musycc.c musycc_del_chan(ci_t *ci, int channum) · line 1694
Quoted 5 lines
drivers/staging/cxt1e1/musycc.c +1
-1@@ -1684,7 +1691,8 @@ musycc_del_chan(ci_t *ci, int channum) {mch_t *ch; -if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))/* sanity chk param */ +/* sanity chk param */
This kind of comment is too obvious. Just delete it.
drivers/staging/cxt1e1/musycc.c musycc_del_chan(ci_t *ci, int channum) · line 1698
Quoted 4 lines
drivers/staging/cxt1e1/musycc.c +1
-0+if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))return ECHRNG ; ch =sd_find_chan (ci, channum);if (!ch)
regards,
dan carpenter
2014-05-09 17:07 GMT+09:00 Dan Carpenter <[email protected]>:
Quoted 13 lines
This patch is ok, but here are some additional hints.
drivers/staging/cxt1e1/musycc.c musycc_bh_rx_eom(mpi_t *pi, int gchan) · line 1107
Quoted 8 lines · Daeseok Youn
drivers/staging/cxt1e1/musycc.c +3
-1@@ -1100,7 +1102,9 @@ musycc_bh_rx_eom(mpi_t *pi, int gchan)*/ if (hdlcnum >=228 ) {if (nciProcess_RX_packet) - (*nciProcess_RX_packet) (hdlcnum, status &0x3fff , m, ch->user); + (*nciProcess_RX_packet)(hdlcnum, status & +0x3fff , m, + ch->user);It's possible to break this one up at the commas.
Oh.. I will do that.
Quoted 19 lines
(*nciProcess_RX_packet)(hdlcnum, status & 0x3fff, m, ch->user);Quoted 14 lines
drivers/staging/cxt1e1/musycc.c +2
-1} else#endif /* CONFIG_SBE_WAN256T3_NCOMM */ {@@ -1379,7 +1383,8 @@ musycc_intr_bh_tasklet(ci_t *ci)else ci->iqd_p[headx] =__constant_cpu_to_le32 (INT_EMPTY_ENTRY ); - ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );/* insure wrapness */ +/* insure wrapness */ + ci->iqp_headx = (headx +1 ) & (INT_QUEUE_SIZE -1 );FLUSH_MEM_WRITE ();FLUSH_MEM_READ ();continue ;@@ -1516,7 +1521,8 @@ musycc_intr_bh_tasklet(ci_t *ci)
Quoted 8 lines
drivers/staging/cxt1e1/musycc.c musycc_intr_bh_tasklet(ci_t *ci) · line 1525
Quoted 6 lines
drivers/staging/cxt1e1/musycc.c +2
-1pr_info ("%s: RX buffer overflow [ONR] on channel %d, mode %x\n" , ci->devname, ch->channum, ch->p.chan_mode); -//musycc_dump_rxbuffer_ring (ch, 0); /* RLD DEBUG */ +/* RLD DEBUG */ +//musycc_dump_rxbuffer_ring (ch, 0); Just delete this commented out code.
Yes. it can be removed.
Quoted 18 lines
Quoted 18 lines
drivers/staging/cxt1e1/musycc.c +2
-1} }musycc_chan_restart (ch);@@ -1573,7 +1579,8 @@ musycc_intr_bh_tasklet(ci_t *ci) }/* switch on err */ /* Check for interrupt lost condition */ -if ((currInt &INTRPT_ILOST_M ) && (cxt1e1_log_level >=LOG_ERROR )) +if ((currInt &INTRPT_ILOST_M ) && + (cxt1e1_log_level >=LOG_ERROR ))pr_info ("%s: Interrupt queue overflow - ILOST asserted\n" , ci->devname);/* insure wrapness */ @@ -1684,7 +1691,8 @@ musycc_del_chan(ci_t *ci, int channum) {mch_t *ch;
Quoted 4 lines
drivers/staging/cxt1e1/musycc.c musycc_del_chan(ci_t *ci, int channum) · line 1694
Quoted 2 lines
drivers/staging/cxt1e1/musycc.c +1
-1-if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))/* sanity chk param */ +/* sanity chk param */ This kind of comment is too obvious. Just delete it.
musycc_del_chan() in "#if 0" block will be removed it is not needed.
Quoted 8 lines
drivers/staging/cxt1e1/musycc.c musycc_del_chan(ci_t *ci, int channum) · line 1698
Quoted 5 lines
drivers/staging/cxt1e1/musycc.c +1
-0+if ((channum <0 ) || (channum >= (MUSYCC_NPORTS *MUSYCC_NCHANS )))return ECHRNG ; ch =sd_find_chan (ci, channum);if (!ch)regards,
dan carpenter
Thanks.
Regards,
Daeseok Youn.