nvme: Delete unusual fallthrough for cases have no body

All the cases listed adjacently and use only for cases have any body. Note: Changes include plugins codes also. Signed-off-by: Tokunori Ikegami <[email protected]>
linux-nvme · Feb 4, 2024 · 7662760 · 7662760
1 parent 67529f1
commit 7662760
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 82 deletions.
diff --git a/nvme-print-json.c b/nvme-print-json.c
@@ -3525,9 +3525,7 @@ static void json_feature_show_fields(enum nvme_features_id fid, unsigned int res
 		json_feature_show_fields_spinup_control(r, result);
 		break;
 	case NVME_FEAT_FID_ENH_CTRL_METADATA:
-		fallthrough;
 	case NVME_FEAT_FID_CTRL_METADATA:
-		fallthrough;
 	case NVME_FEAT_FID_NS_METADATA:
 		json_feature_show_fields_ns_metadata(r, fid, buf);
 		break;

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
@@ -4654,9 +4654,7 @@ static void stdout_feature_show_fields(enum nvme_features_id fid,
 		printf("\tSpinup control feature Enabled: %s\n", (result & 1) ? "True" : "False");
 		break;
 	case NVME_FEAT_FID_ENH_CTRL_METADATA:
-		fallthrough;
 	case NVME_FEAT_FID_CTRL_METADATA:
-		fallthrough;
 	case NVME_FEAT_FID_NS_METADATA:
 		if (buf)
 			stdout_host_metadata(fid, (struct nvme_host_metadata *)buf);

diff --git a/nvme.c b/nvme.c
@@ -5395,15 +5395,10 @@ bool nvme_is_fabrics_reg(int offset)
 {
 	switch (offset) {
 	case NVME_REG_CAP:
-		fallthrough;
 	case NVME_REG_VS:
-		fallthrough;
 	case NVME_REG_CC:
-		fallthrough;
 	case NVME_REG_CSTS:
-		fallthrough;
 	case NVME_REG_NSSR:
-		fallthrough;
 	case NVME_REG_CRTO:
 		return true;
 	default:

diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
@@ -132,34 +132,24 @@ static enum eDriveModel GetDriveModel(int idx)
 	if (vendor_id == MICRON_VENDOR_ID) {
 		switch (device_id) {
 		case 0x5196:
-			fallthrough;
 		case 0x51A0:
-			fallthrough;
 		case 0x51A1:
-			fallthrough;
 		case 0x51A2:
 			eModel = M51AX;
 			break;
 		case 0x51B0:
-			fallthrough;
 		case 0x51B1:
-			fallthrough;
 		case 0x51B2:
 			eModel = M51BX;
 			break;
 		case 0x51C0:
-			fallthrough;
 		case 0x51C1:
-			fallthrough;
 		case 0x51C2:
-			fallthrough;
 		case 0x51C3:
 			eModel = M51CX;
 			break;
 		case 0x5405:
-			fallthrough;
 		case 0x5406:
-			fallthrough;
 		case 0x5407:
 			eModel = M5407;
 			break;
@@ -3217,28 +3207,20 @@ static int micron_internal_logs(int argc, char **argv, struct command *cmd,
 		err = -1;
 		switch (aVendorLogs[i].ucLogPage) {
 		case 0xE1:
-			fallthrough;
 		case 0xE5:
-			fallthrough;
 		case 0xE9:
 			err = 1;
 			break;
 		case 0xE2:
-			fallthrough;
 		case 0xE3:
-			fallthrough;
 		case 0xE4:
-			fallthrough;
 		case 0xE8:
-			fallthrough;
 		case 0xEA:
 			err = get_common_log(dev_fd(dev), aVendorLogs[i].ucLogPage,
 				 &dataBuffer, &bSize);
 			break;
 		case 0xC1:
-			fallthrough;
 		case 0xC2:
-			fallthrough;
 		case 0xC4:
 			err = GetLogPageSize(dev_fd(dev), aVendorLogs[i].ucLogPage,
 					     &bSize);
@@ -3247,7 +3229,6 @@ static int micron_internal_logs(int argc, char **argv, struct command *cmd,
 						       &dataBuffer, bSize);
 			break;
 		case 0xE6:
-			fallthrough;
 		case 0xE7:
 			puiIDDBuf = (unsigned int *)&ctrl;
 			uiMask = puiIDDBuf[1015];
@@ -3273,11 +3254,8 @@ static int micron_internal_logs(int argc, char **argv, struct command *cmd,
 			}
 			break;
 		case 0xF7:
-			fallthrough;
 		case 0xF9:
-			fallthrough;
 		case 0xFC:
-			fallthrough;
 		case 0xFD:
 			if (eModel == M51BX)
 				(void)NVMEResetLog(dev_fd(dev), aVendorLogs[i].ucLogPage,

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
@@ -1726,7 +1726,6 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 	case WDC_NVME_VID_2:
 		switch (read_device_id) {
 		case WDC_NVME_SN630_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN630_DEV_ID_1:
 			capabilities = (WDC_DRIVE_CAP_CAP_DIAG | WDC_DRIVE_CAP_INTERNAL_LOG |
 					WDC_DRIVE_CAP_DRIVE_STATUS | WDC_DRIVE_CAP_CLEAR_ASSERT |
@@ -1743,19 +1742,12 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 			break;
 
 		case WDC_NVME_SN640_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN640_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN640_DEV_ID_2:
-			fallthrough;
 		case WDC_NVME_SN640_DEV_ID_3:
-			fallthrough;
 		case WDC_NVME_SN560_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN560_DEV_ID_2:
-			fallthrough;
 		case WDC_NVME_SN560_DEV_ID_3:
-			fallthrough;
 		case WDC_NVME_SN660_DEV_ID:
 			/* verify the 0xC0 log page is supported */
 			if (wdc_nvme_check_supported_log_page(r, dev,
@@ -1816,17 +1808,14 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 			break;
 
 		case WDC_NVME_SN840_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN840_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN860_DEV_ID:
 			/* verify the 0xC0 log page is supported */
 			if (wdc_nvme_check_supported_log_page(r, dev,
 							      WDC_NVME_GET_EOL_STATUS_LOG_OPCODE))
 				capabilities |= WDC_DRIVE_CAP_C0_LOG_PAGE;
 			fallthrough;
 		case WDC_NVME_ZN540_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN540_DEV_ID:
 			capabilities |= (WDC_DRIVE_CAP_CAP_DIAG | WDC_DRIVE_CAP_INTERNAL_LOG |
 					WDC_DRIVE_CAP_DRIVE_STATUS | WDC_DRIVE_CAP_CLEAR_ASSERT |
@@ -1847,17 +1836,11 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 			break;
 
 		case WDC_NVME_SN650_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN650_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN650_DEV_ID_2:
-			fallthrough;
 		case WDC_NVME_SN650_DEV_ID_3:
-			fallthrough;
 		case WDC_NVME_SN650_DEV_ID_4:
-			fallthrough;
 		case WDC_NVME_SN655_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN550_DEV_ID:
 			/* verify the 0xC0 log page is supported */
 			if (wdc_nvme_check_supported_log_page(r, dev,
@@ -1907,7 +1890,6 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 			break;
 
 		case WDC_NVME_SN861_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN861_DEV_ID_1:
 			capabilities |= (WDC_DRIVE_CAP_C0_LOG_PAGE |
 				WDC_DRIVE_CAP_C3_LOG_PAGE |
@@ -1936,11 +1918,8 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 			break;
 
 		case WDC_NVME_SN520_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN520_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN520_DEV_ID_2:
-			fallthrough;
 		case WDC_NVME_SN810_DEV_ID:
 			capabilities = WDC_DRIVE_CAP_DUI_DATA;
 			break;
@@ -2010,19 +1989,14 @@ static __u64 wdc_get_drive_capabilities(nvme_root_t r, struct nvme_dev *dev)
 		case WDC_NVME_SN8000S_DEV_ID:
 			fallthrough;
 		case WDC_NVME_SN740_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN740_DEV_ID_1:
-			fallthrough;
 		case WDC_NVME_SN740_DEV_ID_2:
-			fallthrough;
 		case WDC_NVME_SN740_DEV_ID_3:
-			fallthrough;
 		case WDC_NVME_SN340_DEV_ID:
 			capabilities = WDC_DRIVE_CAP_DUI;
 			break;
 
 		case WDC_NVME_ZN350_DEV_ID:
-			fallthrough;
 		case WDC_NVME_ZN350_DEV_ID_1:
 			capabilities = WDC_DRIVE_CAP_DUI_DATA | WDC_DRIVE_CAP_VU_FID_CLEAR_PCIE |
 				       WDC_DRIVE_CAP_C0_LOG_PAGE |
@@ -7047,39 +7021,23 @@ static int wdc_get_c0_log_page(nvme_root_t r, struct nvme_dev *dev, char *format
 
 	switch (device_id) {
 	case WDC_NVME_SN640_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_2:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_3:
-		fallthrough;
 	case WDC_NVME_SN840_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN840_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN860_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN560_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN560_DEV_ID_2:
-		fallthrough;
 	case WDC_NVME_SN560_DEV_ID_3:
-		fallthrough;
 	case WDC_NVME_SN550_DEV_ID:
 		ret = wdc_get_c0_log_page_sn(r, dev, uuid_index, format, namespace_id, fmt);
 		break;
-
 	case WDC_NVME_SN650_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN650_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN650_DEV_ID_2:
-		fallthrough;
 	case WDC_NVME_SN650_DEV_ID_3:
-		fallthrough;
 	case WDC_NVME_SN650_DEV_ID_4:
-		fallthrough;
 	case WDC_NVME_SN655_DEV_ID:
 		if (uuid_index == 0) {
 			log_id = WDC_NVME_GET_SMART_CLOUD_ATTR_LOG_ID;
@@ -7137,9 +7095,7 @@ static int wdc_get_c0_log_page(nvme_root_t r, struct nvme_dev *dev, char *format
 		}
 		free(data);
 		break;
-
 	case WDC_NVME_ZN350_DEV_ID:
-		fallthrough;
 	case WDC_NVME_ZN350_DEV_ID_1:
 		data = (__u8 *)malloc(sizeof(__u8) * WDC_NVME_SMART_CLOUD_ATTR_LEN);
 		if (!data) {
@@ -7405,17 +7361,11 @@ static int wdc_get_ca_log_page(nvme_root_t r, struct nvme_dev *dev, char *format
 		}
 		break;
 	case WDC_NVME_SN640_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_2:
-		fallthrough;
 	case WDC_NVME_SN640_DEV_ID_3:
-		fallthrough;
 	case WDC_NVME_SN840_DEV_ID:
-		fallthrough;
 	case WDC_NVME_SN840_DEV_ID_1:
-		fallthrough;
 	case WDC_NVME_SN860_DEV_ID:
 		if (cust_id == WDC_CUSTOMER_ID_0x1005) {
 			data = (__u8 *)malloc(sizeof(__u8) * WDC_FB_CA_LOG_BUF_LEN);
@@ -11678,7 +11628,6 @@ static int wdc_vs_drive_info(int argc, char **argv,
 
 			break;
 		case WDC_NVME_SN861_DEV_ID:
-			fallthrough;
 		case WDC_NVME_SN861_DEV_ID_1:
 			data_len = sizeof(info);
 			num_dwords = data_len / 4;