Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2e80164 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva
Browse files

scsi: aic7xxx: mark expected switch fall-throughs 



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.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
parent 74f79099

drivers/scsi/aic7xxx/aic7xxx_core.c

+9 −3
Original line number Diff line number Diff line
@@ -4920,24 +4920,30 @@ ahc_fini_scbdata(struct ahc_softc *ahc) 
		}

		ahc_dma_tag_destroy(ahc, scb_data->sg_dmat);

	}

		/* fall through */

	case 6:

		ahc_dmamap_unload(ahc, scb_data->sense_dmat,

				  scb_data->sense_dmamap);

		/* fall through */

	case 5:

		ahc_dmamem_free(ahc, scb_data->sense_dmat, scb_data->sense,

				scb_data->sense_dmamap);

		ahc_dmamap_destroy(ahc, scb_data->sense_dmat,

				   scb_data->sense_dmamap);

		/* fall through */

	case 4:

		ahc_dma_tag_destroy(ahc, scb_data->sense_dmat);

		/* fall through */

	case 3:

		ahc_dmamap_unload(ahc, scb_data->hscb_dmat,

				  scb_data->hscb_dmamap);

		/* fall through */

	case 2:

		ahc_dmamem_free(ahc, scb_data->hscb_dmat, scb_data->hscbs,

				scb_data->hscb_dmamap);

		ahc_dmamap_destroy(ahc, scb_data->hscb_dmat,

				   scb_data->hscb_dmamap);

		/* fall through */

	case 1:

		ahc_dma_tag_destroy(ahc, scb_data->hscb_dmat);

		break;
@@ -6002,8 +6008,8 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, 
				if ((scb->flags & SCB_ACTIVE) == 0)

					printk("Inactive SCB in Waiting List\n");

				ahc_done(ahc, scb);

				/* FALLTHROUGH */

			}

				/* fall through */

			case SEARCH_REMOVE:

				next = ahc_rem_wscb(ahc, next, prev);

				break;
@@ -7008,8 +7014,8 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts) 
		}

		address -= address_offset;

		fmt3_ins->address = address;

		/* FALLTHROUGH */

	}

		/* fall through */

	case AIC_OP_OR:

	case AIC_OP_AND:

	case AIC_OP_XOR:
@@ -7035,7 +7041,7 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts) 
			fmt1_ins->opcode = AIC_OP_AND;

			fmt1_ins->immediate = 0xff;

		}

		/* FALLTHROUGH */

		/* fall through */

	case AIC_OP_ROL:

		if ((ahc->features & AHC_ULTRA2) != 0) {

			int i, count;