Signed-off-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/qedf/qedf_main.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 3407a05e898b..2bedad13f3f4 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -615,8 +615,6 @@ static struct scsi_transport_template 
*qedf_fc_vport_transport_template;
 static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)
 {
        struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
-       struct fc_rport_libfc_priv *rp = rport->dd_data;
-       struct qedf_rport *fcport;
        struct fc_lport *lport;
        struct qedf_ctx *qedf;
        struct qedf_ioreq *io_req;
@@ -636,8 +634,6 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)
                goto out;
        }
 
-       fcport = (struct qedf_rport *)&rp[1];
-
        io_req = (struct qedf_ioreq *)sc_cmd->SCp.ptr;
        if (!io_req) {
                QEDF_ERR(&(qedf->dbg_ctx), "io_req is NULL.\n");
@@ -741,8 +737,6 @@ static int qedf_eh_host_reset(struct scsi_cmnd *sc_cmd)
        struct fc_lport *lport;
        struct qedf_ctx *qedf;
        struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
-       struct fc_rport_libfc_priv *rp = rport->dd_data;
-       struct qedf_rport *fcport = (struct qedf_rport *)&rp[1];
        int rval;
 
        rval = fc_remote_port_chkready(rport);
@@ -752,11 +746,6 @@ static int qedf_eh_host_reset(struct scsi_cmnd *sc_cmd)
                return FAILED;
        }
 
-       if (fcport == NULL) {
-               QEDF_ERR(NULL, "device_reset: rport is NULL\n");
-               return FAILED;
-       }
-
        lport = shost_priv(sc_cmd->device->host);
        qedf = lport_priv(lport);
 
-- 
2.16.4

Reply via email to