scsi: libfc: Replace ->lport_reset callback with function call
The ->lport_reset callback only ever had one implementation, which already is exported. So remove it and use the function directly. Signed-off-by: Hannes Reinecke <hare@suse.com> Acked-by: Johannes Thumshirn <jth@kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Родитель
7ab24dd165
Коммит
31c0a631a4
|
@ -2543,7 +2543,7 @@ int fnic_reset(struct Scsi_Host *shost)
|
|||
* Reset local port, this will clean up libFC exchanges,
|
||||
* reset remote port sessions, and if link is up, begin flogi
|
||||
*/
|
||||
ret = lp->tt.lport_reset(lp);
|
||||
ret = fc_lport_reset(lp);
|
||||
|
||||
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
|
||||
"Returning from fnic reset %s\n",
|
||||
|
|
|
@ -2224,7 +2224,7 @@ int fc_eh_host_reset(struct scsi_cmnd *sc_cmd)
|
|||
|
||||
fc_block_scsi_eh(sc_cmd);
|
||||
|
||||
lport->tt.lport_reset(lport);
|
||||
fc_lport_reset(lport);
|
||||
wait_tmo = jiffies + FC_HOST_RESET_TIMEOUT;
|
||||
while (!fc_fcp_lport_queue_ready(lport) && time_before(jiffies,
|
||||
wait_tmo))
|
||||
|
|
|
@ -1868,9 +1868,6 @@ int fc_lport_init(struct fc_lport *lport)
|
|||
if (!lport->tt.lport_recv)
|
||||
lport->tt.lport_recv = fc_lport_recv_req;
|
||||
|
||||
if (!lport->tt.lport_reset)
|
||||
lport->tt.lport_reset = fc_lport_reset;
|
||||
|
||||
fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
|
||||
fc_host_node_name(lport->host) = lport->wwnn;
|
||||
fc_host_port_name(lport->host) = lport->wwpn;
|
||||
|
|
|
@ -627,13 +627,6 @@ struct libfc_function_template {
|
|||
*/
|
||||
void (*lport_recv)(struct fc_lport *, struct fc_frame *);
|
||||
|
||||
/*
|
||||
* Reset the local port.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*lport_reset)(struct fc_lport *);
|
||||
|
||||
/*
|
||||
* Set the local port FC_ID.
|
||||
*
|
||||
|
|
Загрузка…
Ссылка в новой задаче