From c6b032a4c9407107dbbf32b843486f718f96af32 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 1 May 2019 23:44:06 +0000
Subject: [PATCH] qla2xxx-32gbit: Move qla2x00_set_fcport_state() from a .h
 into a .c file

The qla2x00_set_fcport_state() function is not in the hot path so move its
definition from a .h into a .c file.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8306 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_gbl.h    |  1 +
 qla2x00t-32gbit/qla_init.c   | 18 ++++++++++++++++++
 qla2x00t-32gbit/qla_inline.h | 19 -------------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/qla2x00t-32gbit/qla_gbl.h b/qla2x00t-32gbit/qla_gbl.h
index a1bb94f6d..84b287d08 100644
--- a/qla2x00t-32gbit/qla_gbl.h
+++ b/qla2x00t-32gbit/qla_gbl.h
@@ -79,6 +79,7 @@ int qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e);
 extern void *qla2x00_alloc_iocbs_ready(struct qla_qpair *, srb_t *);
 extern int qla24xx_update_fcport_fcp_prio(scsi_qla_host_t *, fc_port_t *);
 
+extern void qla2x00_set_fcport_state(fc_port_t *fcport, int state); 
 extern fc_port_t *
 qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t );
 
diff --git a/qla2x00t-32gbit/qla_init.c b/qla2x00t-32gbit/qla_init.c
index 85f786f76..927b2b9f0 100644
--- a/qla2x00t-32gbit/qla_init.c
+++ b/qla2x00t-32gbit/qla_init.c
@@ -4788,6 +4788,24 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
 	return (rval);
 }
 
+void qla2x00_set_fcport_state(fc_port_t *fcport, int state)
+{
+	int old_state;
+
+	old_state = atomic_read(&fcport->state);
+	atomic_set(&fcport->state, state);
+
+	/* Don't print state transitions during initial allocation of fcport */
+	if (old_state && old_state != state) {
+		ql_dbg(ql_dbg_disc, fcport->vha, 0x207d,
+		    "FCPort %s state transitioned from %s to %s - "
+		    "portid=%02x%02x%02x.\n", wwn_to_str(fcport->port_name),
+		    port_state_str[old_state], port_state_str[state],
+		    fcport->d_id.b.domain, fcport->d_id.b.area,
+		    fcport->d_id.b.al_pa);
+	}
+}
+
 static void
 qla2x00_rport_del(void *data)
 {
diff --git a/qla2x00t-32gbit/qla_inline.h b/qla2x00t-32gbit/qla_inline.h
index 7717ec77d..81dee3b76 100644
--- a/qla2x00t-32gbit/qla_inline.h
+++ b/qla2x00t-32gbit/qla_inline.h
@@ -126,25 +126,6 @@ static inline const char *wwn_to_str(const u8 port_name[8])
 	return wwn;
 }
 
-static inline void
-qla2x00_set_fcport_state(fc_port_t *fcport, int state)
-{
-	int old_state;
-
-	old_state = atomic_read(&fcport->state);
-	atomic_set(&fcport->state, state);
-
-	/* Don't print state transitions during initial allocation of fcport */
-	if (old_state && old_state != state) {
-		ql_dbg(ql_dbg_disc, fcport->vha, 0x207d,
-		    "FCPort %s state transitioned from %s to %s - "
-		    "portid=%02x%02x%02x.\n", wwn_to_str(fcport->port_name),
-		    port_state_str[old_state], port_state_str[state],
-		    fcport->d_id.b.domain, fcport->d_id.b.area,
-		    fcport->d_id.b.al_pa);
-	}
-}
-
 static inline int
 qla2x00_hba_err_chk_enabled(srb_t *sp)
 {