staging: qlge: fix trailing */ in block comment
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 staging: qlge: fix trailing */ in block comment
Remove trailing "*/" in block comments.
--- drivers/staging/qlge/qlge_main.c | 3 ++- drivers/staging/qlge/qlge_mpi.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/staging/qlge/qlge_main.c +2 -1
@@ -3244,7 +3244,8 @@ static void ql_set_irq_mask(struct ql_adapter *qdev, struct intr_context *ctx)*/ ctx->irq_mask = (1 << qdev->rx_ring[vect].cq_id);/* Add the TX ring(s) serviced by this vector -* to the mask. */ +* to the mask. +*/ for (j = 0; j < tx_rings_per_vector; j++) { ctx->irq_mask |= (1 << qdev->rx_ring[qdev->rss_ring_count +
drivers/staging/qlge/qlge_mpi.c +6 -4
@@ -389,7 +389,8 @@ static void ql_init_fw_done(struct ql_adapter *qdev, struct mbox_params *mbcp)* This can get called iteratively from the mpi_work thread * when events arrive via an interrupt. * It also gets called when a mailbox command is polling for -* it's completion. */ +* it's completion. +*/ static int ql_mpi_handler (struct ql_adapter *qdev,struct mbox_params *mbcp) {int status;
@@ -520,7 +521,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)* changed when a mailbox command is waiting * for a response and an AEN arrives and * is handled. -* */ +*/ mbcp->out_count = orig_count;return status; }
@@ -555,7 +556,8 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)* here because some AEN might arrive while * we're waiting for the mailbox command to * complete. If more than 5 seconds expire we can -* assume something is wrong. */ +* assume something is wrong. +*/ count = jiffies +HZ *MAILBOX_TIMEOUT ; do { /* Wait for the interrupt to come in. */
@@ -1178,7 +1180,7 @@ void ql_mpi_idc_work(struct work_struct *work)/* Signal the resulting link up AEN * that the frame routing and mac addr * needs to be set. -* */ +*/ set_bit (QL_CAM_RT_SET , &qdev->flags);/* Do ACK if required */ if (timeout) {
--
2.27.0
PATCH 2/2 staging: qlge: fix else after return or break
In reply to a message not in the archiveRemove unnecessary elses after return or break.
--- drivers/staging/qlge/qlge_dbg.c | 23 ++++++++++------------- drivers/staging/qlge/qlge_main.c | 8 ++++---- drivers/staging/qlge/qlge_mpi.c | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-)
drivers/staging/qlge/qlge_dbg.c +10 -13
@@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ; - }else { -if (value[0 ]) -pr_err ("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ], - value[2 ]); } +if (value[0 ]) +pr_err ("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n" , + qdev->ndev->name, i, value[1 ], value[0 ], + value[2 ]); }for (i =0 ; i <32 ; i++) { if (ql_get_mac_addr_reg
@@ -1404,11 +1403,10 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ; - }else { -if (value[0 ]) -pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ]); } +if (value[0 ]) +pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , + qdev->ndev->name, i, value[1 ], value[0 ]); }ql_sem_unlock (qdev,SEM_MAC_ADDR_MASK ); }
@@ -1427,11 +1425,10 @@ void ql_dump_routing_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of routing index register\n" , __func__);return ; - }else { -if (value) -pr_err ("%s: Routing Mask %d = 0x%.08x\n" , - qdev->ndev->name, i, value); } +if (value) +pr_err ("%s: Routing Mask %d = 0x%.08x\n" , + qdev->ndev->name, i, value); }ql_sem_unlock (qdev,SEM_RT_IDX_MASK ); }
drivers/staging/qlge/qlge_main.c +4 -4
@@ -3778,10 +3778,10 @@ static int ql_wol(struct ql_adapter *qdev)"Failed to set magic packet on %s.\n" , qdev->ndev->name);return status; - }else -netif_info (qdev, drv, qdev->ndev, -"Enabled magic packet successfully on %s.\n" , - qdev->ndev->name); + } +netif_info (qdev, drv, qdev->ndev, +"Enabled magic packet successfully on %s.\n" , + qdev->ndev->name); wol |=MB_WOL_MAGIC_PKT ; }
drivers/staging/qlge/qlge_mpi.c +2 -2
@@ -276,8 +276,8 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)netif_err (qdev, ifup, qdev->ndev,"Failed to init CAM/Routing tables.\n" );return ; - }else -clear_bit (QL_CAM_RT_SET , &qdev->flags); + } +clear_bit (QL_CAM_RT_SET , &qdev->flags); }/* Queue up a worker to check the frame
--
2.27.0
Re: [PATCH 2/2] staging: qlge: fix else after return or break
Quoted 1 line · Coiby Xu
Remove unnecessary elses after return or break.
unrelated trivia:
drivers/staging/qlge/qlge_dbg.c
Quoted 1 line
drivers/staging/qlge/qlge_dbg.c +0
-0
[]
drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1398
Quoted 9 lines
drivers/staging/qlge/qlge_dbg.c +0
-5@@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ; - }else { -if (value[0 ]) -pr_err ("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ], - value[2 ]);
looks like all of these could use netdev_err
netdev_err(qdev, "etc...", i, value[1], value[0], value[2]);
etc...
Re: [PATCH 2/2] staging: qlge: fix else after return or break
Quoted 19 lines · Joe Perches
Quoted 1 line · Coiby Xu
Remove unnecessary elses after return or break.
unrelated trivia:
drivers/staging/qlge/qlge_dbg.c
Quoted 1 line
drivers/staging/qlge/qlge_dbg.c +0
-0[]
drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1398
Quoted 9 lines
drivers/staging/qlge/qlge_dbg.c +0
-5@@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ; - }else { -if (value[0 ]) -pr_err ("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ], - value[2 ]);looks like all of these could use
netdev_err
Quoted 5 lines
netdev_err(qdev, "etc...", i, value[1], value[0], value[2]);etc...
Interestingly, scripts/checkpatch.pl couldn't detect this problem. I once used printk(KERN_ALERT...) and the script would properly warn me that,
WARNING: Prefer [subsystem eg: netdev]_alert([subsystem]dev, ... then dev_alert(dev, ... then pr_alert(... to printk(KERN_ALERT .
I'll fix this issue when sending another version of the patches. Thank you for the reminding!
--
Best regards,
Coiby
Re: [PATCH 2/2] staging: qlge: fix else after return or break
In reply to Joe PerchesQuoted 19 lines · Joe Perches
Quoted 1 line · Coiby Xu
Remove unnecessary elses after return or break.
unrelated trivia:
drivers/staging/qlge/qlge_dbg.c
Quoted 1 line
drivers/staging/qlge/qlge_dbg.c +0
-0[]
drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1398
Quoted 9 lines
drivers/staging/qlge/qlge_dbg.c +0
-5@@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ; - }else { -if (value[0 ]) -pr_err ("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ], - value[2 ]);looks like all of these could use
netdev_err
Quoted 4 lines
netdev_err(qdev, "etc...", i, value[1], value[0], value[2]);etc...
Should we also replace all pr_errs with netdev_err in ql_dump_* functions? I'm not sure how we will use ql_dump_*. For example, ql_dump_regs is not referred by any kernel source, so I guess it's for the sole purpose of debugging the driver by the developer. But one pr_err in ql_dump_routing_entries which is called by dl_dump_regs doesn't prints out the device name whereas the other does,
Quoted 11 lines
void
ql_dump_routing_entries(struct ql_adapter *qdev){ int i; u32 value; i = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK); if (i) return; for (i = 0; i < 16; i++) { value = 0; if (ql_get_routing_reg(qdev, i, &value)) {
Quoted 8 lines
pr_err("%s: Failed read of routing index register\n",
__func__);
break;
}
if (value)
pr_err("%s: Routing Mask %d = 0x%.08x\n",
qdev->ndev->name, i, value);
}--
Best regards,
Coiby
Re: [PATCH 2/2] staging: qlge: fix else after return or break
Quoted 5 lines · Coiby Xu
Quoted 4 lines · Joe Perches
Quoted 1 line · Coiby Xu
Remove unnecessary elses after return or break.
unrelated trivia:
[]
Quoted 1 line
Quoted 1 line
looks like all of these could use
netdev_err
[]
Quoted 2 lines
should we also replace all
pr_errswithnetdev_errin ql_dump_* functions?
Ideally, anywhere a struct netdevice * is available, it should be used to output netdev_<level> in preference to pr_<level>.
Re: [PATCH 2/2] staging: qlge: fix else after return or break
Quoted 6 lines · Joe Perches
Quoted 5 lines · Coiby Xu
Quoted 4 lines · Joe Perches
Quoted 1 line · Coiby Xu
Remove unnecessary elses after return or break.
unrelated trivia:
Quoted 8 lines
[]
Quoted 1 line
Quoted 1 line
looks like all of these could use
netdev_err[]
Quoted 2 lines
should we also replace all
pr_errswithnetdev_errin ql_dump_* functions?Ideally, anywhere a struct netdevice * is available, it should be used to output netdev_<level> in preference to pr_<level>.
Thank you for the explaining!
--
Best regards,
Coiby
Re: [PATCH 2/2] staging: qlge: fix else after return or break
In reply to Coiby Xudrivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1405
Quoted 4 lines · Coiby Xu
drivers/staging/qlge/qlge_dbg.c +0
-0@@ -1404,11 +1403,10 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ;
^^^^^^
drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1411
Quoted 10 lines
drivers/staging/qlge/qlge_dbg.c +3
-4- }else { -if (value[0 ]) -pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ]); } +if (value[0 ]) +pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , + qdev->ndev->name, i, value[1 ], value[0 ]); }ql_sem_unlock (qdev,SEM_MAC_ADDR_MASK );
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
drivers/staging/qlge/qlge_dbg.c void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1427
Quoted 5 lines
drivers/staging/qlge/qlge_dbg.c +0
-0}@@ -1427,11 +1425,10 @@ void ql_dump_routing_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of routing index register\n" , __func__);return ;
^^^^^^
drivers/staging/qlge/qlge_dbg.c void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1433
Quoted 10 lines
drivers/staging/qlge/qlge_dbg.c +3
-4- }else { -if (value) -pr_err ("%s: Routing Mask %d = 0x%.08x\n" , - qdev->ndev->name, i, value); } +if (value) +pr_err ("%s: Routing Mask %d = 0x%.08x\n" , + qdev->ndev->name, i, value); }ql_sem_unlock (qdev,SEM_RT_IDX_MASK );
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Review void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1434
Quoted 1 line
(quoted diff) +0
-0}
This is not caused by your patch, but in these two functions we return without dropping the lock. There may be other places as well, but these are the two I can see without leaving my email client.
Do you think you could fix that before we forget? Just change the return to a break to fix the bug.
regards,
dan carpenter
Re: [PATCH 2/2] staging: qlge: fix else after return or break
Quoted 36 lines · Dan Carpenter
drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1405
Quoted 4 lines · Coiby Xu
drivers/staging/qlge/qlge_dbg.c +0
-0@@ -1404,11 +1403,10 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of mac index register\n" , __func__);return ;^^^^^^drivers/staging/qlge/qlge_dbg.c static void ql_dump_cam_entries(struct ql_adapter *qdev) · line 1411
Quoted 10 lines
drivers/staging/qlge/qlge_dbg.c +3
-4- }else { -if (value[0 ]) -pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , - qdev->ndev->name, i, value[1 ], value[0 ]); } +if (value[0 ]) +pr_err ("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n" , + qdev->ndev->name, i, value[1 ], value[0 ]); }ql_sem_unlock (qdev,SEM_MAC_ADDR_MASK );^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^drivers/staging/qlge/qlge_dbg.c void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1427
Quoted 5 lines
drivers/staging/qlge/qlge_dbg.c +0
-0}@@ -1427,11 +1425,10 @@ void ql_dump_routing_entries(struct ql_adapter *qdev)pr_err ("%s: Failed read of routing index register\n" , __func__);return ;^^^^^^drivers/staging/qlge/qlge_dbg.c void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1433
Quoted 10 lines
drivers/staging/qlge/qlge_dbg.c +3
-4- }else { -if (value) -pr_err ("%s: Routing Mask %d = 0x%.08x\n" , - qdev->ndev->name, i, value); } +if (value) +pr_err ("%s: Routing Mask %d = 0x%.08x\n" , + qdev->ndev->name, i, value); }ql_sem_unlock (qdev,SEM_RT_IDX_MASK );^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 8 lines
Review void ql_dump_routing_entries(struct ql_adapter *qdev) · line 1434
Quoted 1 line
(quoted diff) +0
-0}This is not caused by your patch, but in these two functions we return without dropping the lock. There may be other places as well, but these are the two I can see without leaving my email client.
Do you think you could fix that before we forget? Just change the return to a break to fix the bug.
Sure, I'll address this issue in the next series
of patches. Thank you for bringing up this issue!
--
Best regards,
Coiby