Skip to content

Commit cec9cba

Browse files
JoePerchesmartinkpetersen
authored andcommitted
scsi: zfcp: use fallthrough;
Convert the various uses of fallthrough comments to fallthrough; Done via script Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/ Signed-off-by: Joe Perches <[email protected]> Reviewed-by: Fedor Loshakov <[email protected]> Reviewed-by: Steffen Maier <[email protected]> [[email protected]: resolved merge conflict with recently upstream-sent patch "zfcp: expose fabric name as common fc_host sysfs attribute"] Link: https://lore.kernel.org/r/d14669a67a17392490d3184117941123765db1a4.1585663010.git.bblock@linux.ibm.com Signed-off-by: Benjamin Block <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 4e6c78d commit cec9cba

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

drivers/s390/scsi/zfcp_erp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want,
178178
return 0;
179179
if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))
180180
need = ZFCP_ERP_ACTION_REOPEN_PORT;
181-
/* fall through */
181+
fallthrough;
182182
case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
183183
p_status = atomic_read(&port->status);
184184
if (!(p_status & ZFCP_STATUS_COMMON_OPEN))
185185
need = ZFCP_ERP_ACTION_REOPEN_PORT;
186-
/* fall through */
186+
fallthrough;
187187
case ZFCP_ERP_ACTION_REOPEN_PORT:
188188
p_status = atomic_read(&port->status);
189189
if (p_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -196,7 +196,7 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want,
196196
return need;
197197
if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))
198198
need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;
199-
/* fall through */
199+
fallthrough;
200200
case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
201201
a_status = atomic_read(&adapter->status);
202202
if (a_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -1086,7 +1086,7 @@ static enum zfcp_erp_act_result zfcp_erp_lun_strategy(
10861086
if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)
10871087
return zfcp_erp_lun_strategy_close(erp_action);
10881088
/* already closed */
1089-
/* fall through */
1089+
fallthrough;
10901090
case ZFCP_ERP_STEP_LUN_CLOSING:
10911091
if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)
10921092
return ZFCP_ERP_FAILED;
@@ -1415,7 +1415,7 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act,
14151415
if (act->step != ZFCP_ERP_STEP_UNINITIALIZED)
14161416
if (result == ZFCP_ERP_SUCCEEDED)
14171417
zfcp_erp_try_rport_unblock(port);
1418-
/* fall through */
1418+
fallthrough;
14191419
case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
14201420
put_device(&port->dev);
14211421
break;

drivers/s390/scsi/zfcp_fsf.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
564564
case FSF_TOPO_AL:
565565
fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;
566566
fc_host_fabric_name(shost) = 0;
567-
/* fall through */
567+
fallthrough;
568568
default:
569569
fc_host_fabric_name(shost) = 0;
570570
dev_err(&adapter->ccw_device->dev,
@@ -1032,7 +1032,7 @@ static void zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *req)
10321032
switch (fsq->word[0]) {
10331033
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
10341034
zfcp_fc_test_link(zfcp_sdev->port);
1035-
/* fall through */
1035+
fallthrough;
10361036
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
10371037
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
10381038
break;
@@ -1127,7 +1127,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
11271127
break;
11281128
case FSF_PORT_HANDLE_NOT_VALID:
11291129
zfcp_erp_adapter_reopen(adapter, 0, "fsscth1");
1130-
/* fall through */
1130+
fallthrough;
11311131
case FSF_GENERIC_COMMAND_REJECTED:
11321132
case FSF_PAYLOAD_SIZE_MISMATCH:
11331133
case FSF_REQUEST_SIZE_TOO_LARGE:
@@ -1313,7 +1313,7 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)
13131313
break;
13141314
case FSF_SBAL_MISMATCH:
13151315
/* should never occur, avoided in zfcp_fsf_send_els */
1316-
/* fall through */
1316+
fallthrough;
13171317
default:
13181318
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
13191319
break;
@@ -1736,7 +1736,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
17361736
switch (header->fsf_status_qual.word[0]) {
17371737
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
17381738
/* no zfcp_fc_test_link() with failed open port */
1739-
/* fall through */
1739+
fallthrough;
17401740
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
17411741
case FSF_SQ_NO_RETRY_POSSIBLE:
17421742
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
@@ -1909,14 +1909,14 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)
19091909
case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:
19101910
dev_warn(&req->adapter->ccw_device->dev,
19111911
"Opening WKA port 0x%x failed\n", wka_port->d_id);
1912-
/* fall through */
1912+
fallthrough;
19131913
case FSF_ADAPTER_STATUS_AVAILABLE:
19141914
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
19151915
wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE;
19161916
break;
19171917
case FSF_GOOD:
19181918
wka_port->handle = header->port_handle;
1919-
/* fall through */
1919+
fallthrough;
19201920
case FSF_PORT_ALREADY_OPEN:
19211921
wka_port->status = ZFCP_FC_WKA_PORT_ONLINE;
19221922
}
@@ -2059,7 +2059,6 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req)
20592059
case FSF_ADAPTER_STATUS_AVAILABLE:
20602060
switch (header->fsf_status_qual.word[0]) {
20612061
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
2062-
/* fall through */
20632062
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
20642063
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
20652064
break;
@@ -2144,7 +2143,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
21442143

21452144
case FSF_PORT_HANDLE_NOT_VALID:
21462145
zfcp_erp_adapter_reopen(adapter, 0, "fsouh_1");
2147-
/* fall through */
2146+
fallthrough;
21482147
case FSF_LUN_ALREADY_OPEN:
21492148
break;
21502149
case FSF_PORT_BOXED:
@@ -2175,15 +2174,15 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
21752174
(unsigned long long)zfcp_scsi_dev_lun(sdev),
21762175
(unsigned long long)zfcp_sdev->port->wwpn);
21772176
zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);
2178-
/* fall through */
2177+
fallthrough;
21792178
case FSF_INVALID_COMMAND_OPTION:
21802179
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
21812180
break;
21822181
case FSF_ADAPTER_STATUS_AVAILABLE:
21832182
switch (header->fsf_status_qual.word[0]) {
21842183
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
21852184
zfcp_fc_test_link(zfcp_sdev->port);
2186-
/* fall through */
2185+
fallthrough;
21872186
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
21882187
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
21892188
break;
@@ -2277,7 +2276,7 @@ static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req)
22772276
switch (req->qtcb->header.fsf_status_qual.word[0]) {
22782277
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
22792278
zfcp_fc_test_link(zfcp_sdev->port);
2280-
/* fall through */
2279+
fallthrough;
22812280
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
22822281
req->status |= ZFCP_STATUS_FSFREQ_ERROR;
22832282
break;

0 commit comments

Comments
 (0)