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>

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index d9fd2f841585cca6850d1c9000739b7eef69a1d1..bfaba069937f46ceb242e1bfb94c5997f08fcaa8 100644 (file)
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -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",

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index c033946875a78ce4d99080b74bd672c391b20cde..831de3eada9c65cd9389d2d5d0f01875984ac0ce 100644 (file)
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -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))

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index bf79c9bd2a14ad0915a734d6a6dc29cdaa4574bc..05f83a65cc1eed07a81e6ecbc5b351458502491d 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -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;

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 0e9580311e605ea3a11f3748ab9398a384552741..7ee0d2741192a9df7be9eda6a6437be6f1fc7b13 100644 (file)
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -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.
         *