scsi: qla2xxx: Declare qla2x00_find_new_loop_id() static

Since all qla2x00_find_new_loop_id() calls occur in the same source file as
the definition of this function, move that function to just before its
first caller and declare it static. Convert the header above this function
into kernel-doc format.

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_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 034cfc152336da15c8e8bb1efaa27502d84ae72f..97be390e027defab211811c1255fe20fdf36e7f6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -39,8 +39,6 @@ extern int qla81xx_load_risc(scsi_qla_host_t *, uint32_t *);
 extern int qla2x00_perform_loop_resync(scsi_qla_host_t *);
 extern int qla2x00_loop_resync(scsi_qla_host_t *);
 
-extern int qla2x00_find_new_loop_id(scsi_qla_host_t *, fc_port_t *);
-
 extern int qla2x00_fabric_login(scsi_qla_host_t *, fc_port_t *, uint16_t *);
 extern int qla2x00_local_device_login(scsi_qla_host_t *, fc_port_t *);
 

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 948f20805111e0309db7f0928df058e258eb674b..14edf361461463d34a3500b5bfd4bd31af40fac0 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -514,6 +514,49 @@ done:
        return rval;
 }
 
+/**
+ * qla2x00_find_new_loop_id - scan through our port list and find a new usable loop ID
+ * @vha: adapter state pointer.
+ * @dev: port structure pointer.
+ *
+ * Returns:
+ *     qla2x00 local function return status code.
+ *
+ * Context:
+ *     Kernel context.
+ */
+static int qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev)
+{
+       int     rval;
+       struct qla_hw_data *ha = vha->hw;
+       unsigned long flags = 0;
+
+       rval = QLA_SUCCESS;
+
+       spin_lock_irqsave(&ha->vport_slock, flags);
+
+       dev->loop_id = find_first_zero_bit(ha->loop_id_map, LOOPID_MAP_SIZE);
+       if (dev->loop_id >= LOOPID_MAP_SIZE ||
+           qla2x00_is_reserved_id(vha, dev->loop_id)) {
+               dev->loop_id = FC_NO_LOOP_ID;
+               rval = QLA_FUNCTION_FAILED;
+       } else {
+               set_bit(dev->loop_id, ha->loop_id_map);
+       }
+       spin_unlock_irqrestore(&ha->vport_slock, flags);
+
+       if (rval == QLA_SUCCESS)
+               ql_dbg(ql_dbg_disc, dev->vha, 0x2086,
+                      "Assigning new loopid=%x, portid=%x.\n",
+                      dev->loop_id, dev->d_id.b24);
+       else
+               ql_log(ql_log_warn, dev->vha, 0x2087,
+                      "No loop_id's available, portid=%x.\n",
+                      dev->d_id.b24);
+
+       return rval;
+}
+
 static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
        struct event_arg *ea)
 {
@@ -5886,55 +5929,6 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
        return (rval);
 }
 
-/*
- * qla2x00_find_new_loop_id
- *     Scan through our port list and find a new usable loop ID.
- *
- * Input:
- *     ha:     adapter state pointer.
- *     dev:    port structure pointer.
- *
- * Returns:
- *     qla2x00 local function return status code.
- *
- * Context:
- *     Kernel context.
- */
-int
-qla2x00_find_new_loop_id(scsi_qla_host_t *vha, fc_port_t *dev)
-{
-       int     rval;
-       struct qla_hw_data *ha = vha->hw;
-       unsigned long flags = 0;
-
-       rval = QLA_SUCCESS;
-
-       spin_lock_irqsave(&ha->vport_slock, flags);
-
-       dev->loop_id = find_first_zero_bit(ha->loop_id_map,
-           LOOPID_MAP_SIZE);
-       if (dev->loop_id >= LOOPID_MAP_SIZE ||
-           qla2x00_is_reserved_id(vha, dev->loop_id)) {
-               dev->loop_id = FC_NO_LOOP_ID;
-               rval = QLA_FUNCTION_FAILED;
-       } else
-               set_bit(dev->loop_id, ha->loop_id_map);
-
-       spin_unlock_irqrestore(&ha->vport_slock, flags);
-
-       if (rval == QLA_SUCCESS)
-               ql_dbg(ql_dbg_disc, dev->vha, 0x2086,
-                   "Assigning new loopid=%x, portid=%x.\n",
-                   dev->loop_id, dev->d_id.b24);
-       else
-               ql_log(ql_log_warn, dev->vha, 0x2087,
-                   "No loop_id's available, portid=%x.\n",
-                   dev->d_id.b24);
-
-       return (rval);
-}
-
-
 /* FW does not set aside Loop id for MGMT Server/FFFFFAh */
 int
 qla2x00_reserve_mgmt_server_loop_id(scsi_qla_host_t *vha)