diff options
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index c88babce9bca..88642dec080c 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
| @@ -200,7 +200,7 @@ void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req, unsigned long timeout) | |||
| 200 | * returns: 0 - initiated action successfully | 200 | * returns: 0 - initiated action successfully |
| 201 | * <0 - failed to initiate action | 201 | * <0 - failed to initiate action |
| 202 | */ | 202 | */ |
| 203 | int | 203 | static int |
| 204 | zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *adapter, int clear_mask) | 204 | zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *adapter, int clear_mask) |
| 205 | { | 205 | { |
| 206 | int retval; | 206 | int retval; |
| @@ -295,7 +295,7 @@ zfcp_erp_unit_shutdown(struct zfcp_unit *unit, int clear_mask) | |||
| 295 | * zfcp_erp_adisc - send ADISC ELS command | 295 | * zfcp_erp_adisc - send ADISC ELS command |
| 296 | * @port: port structure | 296 | * @port: port structure |
| 297 | */ | 297 | */ |
| 298 | int | 298 | static int |
| 299 | zfcp_erp_adisc(struct zfcp_port *port) | 299 | zfcp_erp_adisc(struct zfcp_port *port) |
| 300 | { | 300 | { |
| 301 | struct zfcp_adapter *adapter = port->adapter; | 301 | struct zfcp_adapter *adapter = port->adapter; |
| @@ -380,7 +380,7 @@ zfcp_erp_adisc(struct zfcp_port *port) | |||
| 380 | * | 380 | * |
| 381 | * If ADISC failed (LS_RJT or timed out) forced reopen of the port is triggered. | 381 | * If ADISC failed (LS_RJT or timed out) forced reopen of the port is triggered. |
| 382 | */ | 382 | */ |
| 383 | void | 383 | static void |
| 384 | zfcp_erp_adisc_handler(unsigned long data) | 384 | zfcp_erp_adisc_handler(unsigned long data) |
| 385 | { | 385 | { |
| 386 | struct zfcp_send_els *send_els; | 386 | struct zfcp_send_els *send_els; |
| @@ -3141,7 +3141,6 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter, | |||
| 3141 | break; | 3141 | break; |
| 3142 | case ZFCP_ERP_ACTION_REOPEN_ADAPTER: | 3142 | case ZFCP_ERP_ACTION_REOPEN_ADAPTER: |
| 3143 | if (result != ZFCP_ERP_SUCCEEDED) { | 3143 | if (result != ZFCP_ERP_SUCCEEDED) { |
| 3144 | struct zfcp_port *port; | ||
| 3145 | list_for_each_entry(port, &adapter->port_list_head, list) | 3144 | list_for_each_entry(port, &adapter->port_list_head, list) |
| 3146 | if (port->rport && | 3145 | if (port->rport && |
| 3147 | !atomic_test_mask(ZFCP_STATUS_PORT_WKA, | 3146 | !atomic_test_mask(ZFCP_STATUS_PORT_WKA, |
