scsi: qla2xxx: Introduce the function qla2xxx_init_sp()

This patch does not change any functionality but makes the next patch
easier to read.

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

diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index bf063c66435236874f3144195987740b77e041d7..0c3d907af76922ed6264beb2cd758c8fdb5f6ab4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -152,6 +152,18 @@ qla2x00_chip_is_down(scsi_qla_host_t *vha)
        return (qla2x00_reset_active(vha) || !vha->hw->flags.fw_started);
 }
 
+static void qla2xxx_init_sp(srb_t *sp, scsi_qla_host_t *vha,
+                           struct qla_qpair *qpair, fc_port_t *fcport)
+{
+       memset(sp, 0, sizeof(*sp));
+       sp->fcport = fcport;
+       sp->iocbs = 1;
+       sp->vha = vha;
+       sp->qpair = qpair;
+       sp->cmd_type = TYPE_SRB;
+       INIT_LIST_HEAD(&sp->elem);
+}
+
 static inline srb_t *
 qla2xxx_get_qpair_sp(scsi_qla_host_t *vha, struct qla_qpair *qpair,
     fc_port_t *fcport, gfp_t flag)
@@ -164,19 +176,9 @@ qla2xxx_get_qpair_sp(scsi_qla_host_t *vha, struct qla_qpair *qpair,
                return NULL;
 
        sp = mempool_alloc(qpair->srb_mempool, flag);
-       if (!sp)
-               goto done;
-
-       memset(sp, 0, sizeof(*sp));
-       sp->fcport = fcport;
-       sp->iocbs = 1;
-       sp->vha = vha;
-       sp->qpair = qpair;
-       sp->cmd_type = TYPE_SRB;
-       INIT_LIST_HEAD(&sp->elem);
-
-done:
-       if (!sp)
+       if (sp)
+               qla2xxx_init_sp(sp, vha, qpair, fcport);
+       else
                QLA_QPAIR_MARK_NOT_BUSY(qpair);
        return sp;
 }