aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2018-07-03 18:20:03 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2018-07-10 22:42:47 -0400
commitfc21ae8927f391b6e3944f82e417355da5d06a83 (patch)
tree72925a7c33e67d83c75596496a8aa74e3507ea7a
parent14b470b56840dbb093abd71f214e9d63770c87b8 (diff)
scsi: mptfusion: mark expected switch fall-throughs
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Warning level 2 was used: -Wimplicit-fallthrough=2 Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/message/fusion/mptbase.c3
-rw-r--r--drivers/message/fusion/mptsas.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a625ac4e2872..c8c8186f1148 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -642,6 +642,7 @@ mptbase_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
642 freereq = 0; 642 freereq = 0;
643 if (event != MPI_EVENT_EVENT_CHANGE) 643 if (event != MPI_EVENT_EVENT_CHANGE)
644 break; 644 break;
645 /* else: fall through */
645 case MPI_FUNCTION_CONFIG: 646 case MPI_FUNCTION_CONFIG:
646 case MPI_FUNCTION_SAS_IO_UNIT_CONTROL: 647 case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:
647 ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD; 648 ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;
@@ -1886,6 +1887,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
1886 case MPI_MANUFACTPAGE_DEVICEID_FC939X: 1887 case MPI_MANUFACTPAGE_DEVICEID_FC939X:
1887 case MPI_MANUFACTPAGE_DEVICEID_FC949X: 1888 case MPI_MANUFACTPAGE_DEVICEID_FC949X:
1888 ioc->errata_flag_1064 = 1; 1889 ioc->errata_flag_1064 = 1;
1890 /* fall through */
1889 case MPI_MANUFACTPAGE_DEVICEID_FC909: 1891 case MPI_MANUFACTPAGE_DEVICEID_FC909:
1890 case MPI_MANUFACTPAGE_DEVICEID_FC929: 1892 case MPI_MANUFACTPAGE_DEVICEID_FC929:
1891 case MPI_MANUFACTPAGE_DEVICEID_FC919: 1893 case MPI_MANUFACTPAGE_DEVICEID_FC919:
@@ -1930,6 +1932,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
1930 pcixcmd &= 0x8F; 1932 pcixcmd &= 0x8F;
1931 pci_write_config_byte(pdev, 0x6a, pcixcmd); 1933 pci_write_config_byte(pdev, 0x6a, pcixcmd);
1932 } 1934 }
1935 /* fall through */
1933 1936
1934 case MPI_MANUFACTPAGE_DEVID_1030_53C1035: 1937 case MPI_MANUFACTPAGE_DEVID_1030_53C1035:
1935 ioc->bus_type = SPI; 1938 ioc->bus_type = SPI;
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 76a66da33996..b8cf2658649e 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -4327,6 +4327,7 @@ mptsas_hotplug_work(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
4327 } 4327 }
4328 } 4328 }
4329 mpt_findImVolumes(ioc); 4329 mpt_findImVolumes(ioc);
4330 /* fall through */
4330 4331
4331 case MPTSAS_ADD_DEVICE: 4332 case MPTSAS_ADD_DEVICE:
4332 memset(&sas_device, 0, sizeof(struct mptsas_devinfo)); 4333 memset(&sas_device, 0, sizeof(struct mptsas_devinfo));