scsi: qedf: Use FC rport as argument for qedf_initiate_tmf()

[linux-2.6-microblaze.git] / drivers / scsi / qedf / qedf_main.c

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 7825765..14c6731 100644 (file)
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -774,7 +774,7 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd)
                goto drop_rdata_kref;
        }
 
-       rc = fc_block_scsi_eh(sc_cmd);
+       rc = fc_block_rport(rport);
        if (rc)
                goto drop_rdata_kref;
 
@@ -858,18 +858,19 @@ out:
 
 static int qedf_eh_target_reset(struct scsi_cmnd *sc_cmd)
 {
-       QEDF_ERR(NULL, "%d:0:%d:%lld: TARGET RESET Issued...",
-                sc_cmd->device->host->host_no, sc_cmd->device->id,
-                sc_cmd->device->lun);
-       return qedf_initiate_tmf(sc_cmd, FCP_TMF_TGT_RESET);
+       struct scsi_target *starget = scsi_target(sc_cmd->device);
+       struct fc_rport *rport = starget_to_rport(starget);
+
+       QEDF_ERR(NULL, "TARGET RESET Issued...");
+       return qedf_initiate_tmf(rport, 0, FCP_TMF_TGT_RESET);
 }
 
 static int qedf_eh_device_reset(struct scsi_cmnd *sc_cmd)
 {
-       QEDF_ERR(NULL, "%d:0:%d:%lld: LUN RESET Issued... ",
-                sc_cmd->device->host->host_no, sc_cmd->device->id,
-                sc_cmd->device->lun);
-       return qedf_initiate_tmf(sc_cmd, FCP_TMF_LUN_RESET);
+       struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
+
+       QEDF_ERR(NULL, "LUN RESET Issued...\n");
+       return qedf_initiate_tmf(rport, sc_cmd->device->lun, FCP_TMF_LUN_RESET);
 }
 
 bool qedf_wait_for_upload(struct qedf_ctx *qedf)