scsi: qla2xxx: Remove dead code (GNN ID)

Remove stale/unused code (GNN ID).

Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 9ee9ce6..2ed04f7 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2485,7 +2485,6 @@ struct ct_sns_desc {
 
 enum discovery_state {
        DSC_DELETED,
-       DSC_GNN_ID,
        DSC_GNL,
        DSC_LOGIN_PEND,
        DSC_LOGIN_FAILED,
@@ -2699,7 +2698,6 @@ extern const char *const port_state_str[5];
 
 static const char *const port_dstate_str[] = {
        [DSC_DELETED]           = "DELETED",
-       [DSC_GNN_ID]            = "GNN_ID",
        [DSC_GNL]               = "GNL",
        [DSC_LOGIN_PEND]        = "LOGIN_PEND",
        [DSC_LOGIN_FAILED]      = "LOGIN_FAILED",
@@ -3492,7 +3490,6 @@ enum qla_work_type {
        QLA_EVT_GPNFT,
        QLA_EVT_GPNFT_DONE,
        QLA_EVT_GNNFT_DONE,
-       QLA_EVT_GNNID,
        QLA_EVT_GFPNID,
        QLA_EVT_SP_RETRY,
        QLA_EVT_IIDMA,

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 2acddc8..08ea8dc 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -730,9 +730,6 @@ int qla24xx_async_gffid(scsi_qla_host_t *vha, fc_port_t *fcport, bool);
 int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
 void qla24xx_async_gpnft_done(scsi_qla_host_t *, srb_t *);
 void qla24xx_async_gnnft_done(scsi_qla_host_t *, srb_t *);
-int qla24xx_async_gnnid(scsi_qla_host_t *, fc_port_t *);
-void qla24xx_handle_gnnid_event(scsi_qla_host_t *, struct event_arg *);
-int qla24xx_post_gnnid_work(struct scsi_qla_host *, fc_port_t *);
 int qla24xx_post_gfpnid_work(struct scsi_qla_host *, fc_port_t *);
 int qla24xx_async_gfpnid(scsi_qla_host_t *, fc_port_t *);
 void qla24xx_handle_gfpnid_event(scsi_qla_host_t *, struct event_arg *);

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index fe1eb06..4738f89 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3893,116 +3893,6 @@ void qla_scan_work_fn(struct work_struct *work)
        spin_unlock_irqrestore(&vha->work_lock, flags);
 }
 
-/* GNN_ID */
-void qla24xx_handle_gnnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
-{
-       qla24xx_post_gnl_work(vha, ea->fcport);
-}
-
-static void qla2x00_async_gnnid_sp_done(srb_t *sp, int res)
-{
-       struct scsi_qla_host *vha = sp->vha;
-       fc_port_t *fcport = sp->fcport;
-       u8 *node_name = fcport->ct_desc.ct_sns->p.rsp.rsp.gnn_id.node_name;
-       struct event_arg ea;
-       u64 wwnn;
-
-       fcport->flags &= ~FCF_ASYNC_SENT;
-       wwnn = wwn_to_u64(node_name);
-       if (wwnn)
-               memcpy(fcport->node_name, node_name, WWN_SIZE);
-
-       memset(&ea, 0, sizeof(ea));
-       ea.fcport = fcport;
-       ea.sp = sp;
-       ea.rc = res;
-
-       ql_dbg(ql_dbg_disc, vha, 0x204f,
-           "Async done-%s res %x, WWPN %8phC %8phC\n",
-           sp->name, res, fcport->port_name, fcport->node_name);
-
-       qla24xx_handle_gnnid_event(vha, &ea);
-
-       /* ref: INIT */
-       kref_put(&sp->cmd_kref, qla2x00_sp_release);
-}
-
-int qla24xx_async_gnnid(scsi_qla_host_t *vha, fc_port_t *fcport)
-{
-       int rval = QLA_FUNCTION_FAILED;
-       struct ct_sns_req       *ct_req;
-       srb_t *sp;
-
-       if (!vha->flags.online || (fcport->flags & FCF_ASYNC_SENT))
-               return rval;
-
-       qla2x00_set_fcport_disc_state(fcport, DSC_GNN_ID);
-       /* ref: INIT */
-       sp = qla2x00_get_sp(vha, fcport, GFP_ATOMIC);
-       if (!sp)
-               goto done;
-
-       fcport->flags |= FCF_ASYNC_SENT;
-       sp->type = SRB_CT_PTHRU_CMD;
-       sp->name = "gnnid";
-       sp->gen1 = fcport->rscn_gen;
-       sp->gen2 = fcport->login_gen;
-       qla2x00_init_async_sp(sp, qla2x00_get_async_timeout(vha) + 2,
-                             qla2x00_async_gnnid_sp_done);
-
-       /* CT_IU preamble  */
-       ct_req = qla2x00_prep_ct_req(fcport->ct_desc.ct_sns, GNN_ID_CMD,
-           GNN_ID_RSP_SIZE);
-
-       /* GNN_ID req */
-       ct_req->req.port_id.port_id = port_id_to_be_id(fcport->d_id);
-
-
-       /* req & rsp use the same buffer */
-       sp->u.iocb_cmd.u.ctarg.req = fcport->ct_desc.ct_sns;
-       sp->u.iocb_cmd.u.ctarg.req_dma = fcport->ct_desc.ct_sns_dma;
-       sp->u.iocb_cmd.u.ctarg.rsp = fcport->ct_desc.ct_sns;
-       sp->u.iocb_cmd.u.ctarg.rsp_dma = fcport->ct_desc.ct_sns_dma;
-       sp->u.iocb_cmd.u.ctarg.req_size = GNN_ID_REQ_SIZE;
-       sp->u.iocb_cmd.u.ctarg.rsp_size = GNN_ID_RSP_SIZE;
-       sp->u.iocb_cmd.u.ctarg.nport_handle = NPH_SNS;
-
-       ql_dbg(ql_dbg_disc, vha, 0xffff,
-           "Async-%s - %8phC hdl=%x loopid=%x portid %06x.\n",
-           sp->name, fcport->port_name,
-           sp->handle, fcport->loop_id, fcport->d_id.b24);
-
-       rval = qla2x00_start_sp(sp);
-       if (rval != QLA_SUCCESS)
-               goto done_free_sp;
-       return rval;
-
-done_free_sp:
-       /* ref: INIT */
-       kref_put(&sp->cmd_kref, qla2x00_sp_release);
-       fcport->flags &= ~FCF_ASYNC_SENT;
-done:
-       return rval;
-}
-
-int qla24xx_post_gnnid_work(struct scsi_qla_host *vha, fc_port_t *fcport)
-{
-       struct qla_work_evt *e;
-       int ls;
-
-       ls = atomic_read(&vha->loop_state);
-       if (((ls != LOOP_READY) && (ls != LOOP_UP)) ||
-               test_bit(UNLOADING, &vha->dpc_flags))
-               return 0;
-
-       e = qla2x00_alloc_work(vha, QLA_EVT_GNNID);
-       if (!e)
-               return QLA_FUNCTION_FAILED;
-
-       e->u.fcport.fcport = fcport;
-       return qla2x00_post_work(vha, e);
-}
-
 /* GPFN_ID */
 void qla24xx_handle_gfpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
 {

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index c66a010..a23cb2e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1718,12 +1718,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
                        }
                        break;
                default:
-                       if (wwn == 0)    {
-                               ql_dbg(ql_dbg_disc, vha, 0xffff,
-                                   "%s %d %8phC post GNNID\n",
-                                   __func__, __LINE__, fcport->port_name);
-                               qla24xx_post_gnnid_work(vha, fcport);
-                       } else if (fcport->loop_id == FC_NO_LOOP_ID) {
+                       if (fcport->loop_id == FC_NO_LOOP_ID) {
                                ql_dbg(ql_dbg_disc, vha, 0x20bd,
                                    "%s %d %8phC post gnl\n",
                                    __func__, __LINE__, fcport->port_name);

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index bbbdf2f..c0ac6bf 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5502,9 +5502,6 @@ qla2x00_do_work(struct scsi_qla_host *vha)
                case QLA_EVT_GNNFT_DONE:
                        qla24xx_async_gnnft_done(vha, e->u.iosb.sp);
                        break;
-               case QLA_EVT_GNNID:
-                       qla24xx_async_gnnid(vha, e->u.fcport.fcport);
-                       break;
                case QLA_EVT_GFPNID:
                        qla24xx_async_gfpnid(vha, e->u.fcport.fcport);
                        break;