[SCSI] libsas: remove unused ata_task_resp fields

Commit 1e34c838 "[SCSI] libsas: remove spurious sata control register
read/write" removed the routines to fake the presence of the sata
control registers, now remove the unused data structure fields to kill
any remaining confusion.

Acked-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index db9238f2ecb8b7596dda9c2d4132000af0910bd7..83118d0b6d0c55faaf0be170ce14e64e42d65814 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -121,10 +121,6 @@ static void sas_ata_task_done(struct sas_task *task)
                        if (unlikely(link->eh_info.err_mask))
                                qc->flags |= ATA_QCFLAG_FAILED;
                }
-
-               dev->sata_dev.sstatus = resp->sstatus;
-               dev->sata_dev.serror = resp->serror;
-               dev->sata_dev.scontrol = resp->scontrol;
        } else {
                ac = sas_to_ata_err(stat);
                if (ac) {

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 6a308d42d98f4ea4402203f9e6e216ce21b2821b..6e64b038c649aef1667e213d38c75a7160d2e5cb 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -171,9 +171,6 @@ struct sata_device {
        struct ata_port *ap;
        struct ata_host ata_host;
        struct ata_taskfile tf;
-       u32 sstatus;
-       u32 serror;
-       u32 scontrol;
 };
 
 /* ---------- Domain device ---------- */
@@ -487,10 +484,6 @@ enum exec_status {
 struct ata_task_resp {
        u16  frame_len;
        u8   ending_fis[24];      /* dev to host or data-in */
-       u32  sstatus;
-       u32  serror;
-       u32  scontrol;
-       u32  sactive;
 };
 
 #define SAS_STATUS_BUF_SIZE 96