Re: [PATCH 05/41] scsi: aic7xxx: aic79xx: mark expected switch fall-through

From: Gustavo A. R. Silva
Date: Thu Jan 10 2019 - 15:16:07 EST


Hi,

Friendly ping (second one):

Who can ack/review/take this patch, please?

Thanks
--
Gustavo

On 12/19/18 9:36 AM, Gustavo A. R. Silva wrote:
Hi,

Friendly ping:

Who can ack or review this patch, please?

Thanks
--
Gustavo

On 11/27/18 10:26 PM, Gustavo A. R. Silva wrote:
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Notice that, in some cases, I replaced "FALLTHROUGH" with a "fall through"
annotation and then placed it at the bottom of the corresponding switch
case, which is what GCC is expecting to find.

Addresses-Coverity-ID: 114961 ("Missing break in switch")
Addresses-Coverity-ID: 114962 ("Missing break in switch")
Addresses-Coverity-ID: 114963 ("Missing break in switch")
Addresses-Coverity-ID: 114964 ("Missing break in switch")
Signed-off-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx>
---
 drivers/scsi/aic7xxx/aic79xx_core.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 9ee75c9a9aa1..7e5044bf05c0 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -2285,6 +2285,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ switch (scb->hscb->task_management) {
ÂÂÂÂÂÂÂÂÂÂÂÂÂ case SIU_TASKMGMT_ABORT_TASK:
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ tag = SCB_GET_TAG(scb);
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂÂÂÂÂÂÂÂÂ case SIU_TASKMGMT_ABORT_TASK_SET:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ case SIU_TASKMGMT_CLEAR_TASK_SET:
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ lun = scb->hscb->lun;
@@ -2295,6 +2296,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂÂÂÂÂÂÂÂÂ case SIU_TASKMGMT_LUN_RESET:
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ lun = scb->hscb->lun;
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂÂÂÂÂÂÂÂÂ case SIU_TASKMGMT_TARGET_RESET:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct ahd_devinfo devinfo;
@@ -6550,8 +6552,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ kfree(sns_map);
ÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ ahd_dma_tag_destroy(ahd, scb_data->sense_dmat);
-ÂÂÂÂÂÂÂ /* FALLTHROUGH */
ÂÂÂÂÂ }
+ÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂ case 6:
ÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂ struct map_node *sg_map;
@@ -6565,8 +6567,8 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ kfree(sg_map);
ÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ ahd_dma_tag_destroy(ahd, scb_data->sg_dmat);
-ÂÂÂÂÂÂÂ /* FALLTHROUGH */
ÂÂÂÂÂ }
+ÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂ case 5:
ÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂ struct map_node *hscb_map;
@@ -7209,6 +7211,7 @@ ahd_init(struct ahd_softc *ahd)
ÂÂÂÂÂÂÂÂÂ case FLX_CSTAT_OVER:
ÂÂÂÂÂÂÂÂÂ case FLX_CSTAT_UNDER:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ warn_user++;
+ÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂÂÂÂÂ case FLX_CSTAT_INVALID:
ÂÂÂÂÂÂÂÂÂ case FLX_CSTAT_OKAY:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ if (warn_user == 0 && bootverbose == 0)
@@ -8413,7 +8416,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
ÂÂÂÂÂÂÂÂÂÂÂÂÂ if ((scb->flags & SCB_ACTIVE) == 0)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ printk("Inactive SCB in Waiting List\n");
ÂÂÂÂÂÂÂÂÂÂÂÂÂ ahd_done_with_status(ahd, scb, status);
-ÂÂÂÂÂÂÂÂÂÂÂ /* FALLTHROUGH */
+ÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂÂÂÂÂ case SEARCH_REMOVE:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ ahd_rem_wscb(ahd, scbid, prev, next, tid);
ÂÂÂÂÂÂÂÂÂÂÂÂÂ *list_tail = prev;
@@ -8422,6 +8425,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
ÂÂÂÂÂÂÂÂÂÂÂÂÂ break;
ÂÂÂÂÂÂÂÂÂ case SEARCH_PRINT:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ printk("0x%x ", scbid);
+ÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂÂÂÂÂ case SEARCH_COUNT:
ÂÂÂÂÂÂÂÂÂÂÂÂÂ prev = scbid;
ÂÂÂÂÂÂÂÂÂÂÂÂÂ break;
@@ -9547,8 +9551,8 @@ ahd_download_instr(struct ahd_softc *ahd, u_int instrptr, uint8_t *dconsts)
ÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂ fmt3_ins = &instr.format3;
ÂÂÂÂÂÂÂÂÂ fmt3_ins->address = ahd_resolve_seqaddr(ahd, fmt3_ins->address);
-ÂÂÂÂÂÂÂ /* FALLTHROUGH */
ÂÂÂÂÂ }
+ÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂ case AIC_OP_OR:
ÂÂÂÂÂ case AIC_OP_AND:
ÂÂÂÂÂ case AIC_OP_XOR:
@@ -9559,7 +9563,7 @@ ahd_download_instr(struct ahd_softc *ahd, u_int instrptr, uint8_t *dconsts)
ÂÂÂÂÂÂÂÂÂÂÂÂÂ fmt1_ins->immediate = dconsts[fmt1_ins->immediate];
ÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ fmt1_ins->parity = 0;
-ÂÂÂÂÂÂÂ /* FALLTHROUGH */
+ÂÂÂÂÂÂÂ /* fall through */
ÂÂÂÂÂ case AIC_OP_ROL:
ÂÂÂÂÂ {
ÂÂÂÂÂÂÂÂÂ int i, count;