Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hannes Reinecke and committed by
Martin K. Petersen
31c0a631 7ab24dd1

+2 -12
+1 -1
drivers/scsi/fnic/fnic_scsi.c
··· 2543 2543 * Reset local port, this will clean up libFC exchanges, 2544 2544 * reset remote port sessions, and if link is up, begin flogi 2545 2545 */ 2546 - ret = lp->tt.lport_reset(lp); 2546 + ret = fc_lport_reset(lp); 2547 2547 2548 2548 FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, 2549 2549 "Returning from fnic reset %s\n",
+1 -1
drivers/scsi/libfc/fc_fcp.c
··· 2224 2224 2225 2225 fc_block_scsi_eh(sc_cmd); 2226 2226 2227 - lport->tt.lport_reset(lport); 2227 + fc_lport_reset(lport); 2228 2228 wait_tmo = jiffies + FC_HOST_RESET_TIMEOUT; 2229 2229 while (!fc_fcp_lport_queue_ready(lport) && time_before(jiffies, 2230 2230 wait_tmo))
-3
drivers/scsi/libfc/fc_lport.c
··· 1868 1868 if (!lport->tt.lport_recv) 1869 1869 lport->tt.lport_recv = fc_lport_recv_req; 1870 1870 1871 - if (!lport->tt.lport_reset) 1872 - lport->tt.lport_reset = fc_lport_reset; 1873 - 1874 1871 fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT; 1875 1872 fc_host_node_name(lport->host) = lport->wwnn; 1876 1873 fc_host_port_name(lport->host) = lport->wwpn;
-7
include/scsi/libfc.h
··· 628 628 void (*lport_recv)(struct fc_lport *, struct fc_frame *); 629 629 630 630 /* 631 - * Reset the local port. 632 - * 633 - * STATUS: OPTIONAL 634 - */ 635 - int (*lport_reset)(struct fc_lport *); 636 - 637 - /* 638 631 * Set the local port FC_ID. 639 632 * 640 633 * This may be provided by the LLD to allow it to be