scsi: qla2xxx: Move qla2x00_is_reserved_id() from qla_inline.h into qla_init.c

The previous patch moved all qla2x00_is_reserved_id() callers into
qla_init.c. Hence also move the qla2x00_is_reserved_id() definition into
qla_init.c.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index bba37820d226594d142f2e852504f43936171727..241ff5ae26f0c74a47c43ee2be379fc804c953af 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -514,6 +514,17 @@ done:
        return rval;
 }
 
+static bool qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)
+{
+       struct qla_hw_data *ha = vha->hw;
+
+       if (IS_FWI2_CAPABLE(ha))
+               return loop_id > NPH_LAST_HANDLE;
+
+       return (loop_id > ha->max_loop_id && loop_id < SNS_FIRST_LOOP_ID) ||
+               loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST;
+}
+
 /**
  * qla2x00_find_new_loop_id - scan through our port list and find a new usable loop ID
  * @vha: adapter state pointer.

diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 57b7e38e3056abf5df9148fc5e5ee0a70f859fcf..cf34df8807ff709db8a94a3258537613a3838de1 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -90,17 +90,6 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize)
                *odest++ = cpu_to_le32(*isrc);
 }
 
-static inline int
-qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)
-{
-       struct qla_hw_data *ha = vha->hw;
-       if (IS_FWI2_CAPABLE(ha))
-               return (loop_id > NPH_LAST_HANDLE);
-
-       return ((loop_id > ha->max_loop_id && loop_id < SNS_FIRST_LOOP_ID) ||
-           loop_id == MANAGEMENT_SERVER || loop_id == BROADCAST);
-}
-
 static inline void
 qla2x00_clean_dsd_pool(struct qla_hw_data *ha, struct crc_context *ctx)
 {