diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-11-17 20:59:45 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-19 14:32:33 -0500 |
commit | 95ac7fd189b7e81a200b4d00b2bb6669b31acf3a (patch) | |
tree | cf1b42bd7dd121657537fd16eff9c10422fa61f7 | |
parent | 18a4d0a22ed6c54b67af7718c305cd010f09ddf8 (diff) |
[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>
-rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 4 | ||||
-rw-r--r-- | include/scsi/libsas.h | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index db9238f2ecb8..83118d0b6d0c 100644 --- 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) | |||
121 | if (unlikely(link->eh_info.err_mask)) | 121 | if (unlikely(link->eh_info.err_mask)) |
122 | qc->flags |= ATA_QCFLAG_FAILED; | 122 | qc->flags |= ATA_QCFLAG_FAILED; |
123 | } | 123 | } |
124 | |||
125 | dev->sata_dev.sstatus = resp->sstatus; | ||
126 | dev->sata_dev.serror = resp->serror; | ||
127 | dev->sata_dev.scontrol = resp->scontrol; | ||
128 | } else { | 124 | } else { |
129 | ac = sas_to_ata_err(stat); | 125 | ac = sas_to_ata_err(stat); |
130 | if (ac) { | 126 | if (ac) { |
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 6a308d42d98f..6e64b038c649 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -171,9 +171,6 @@ struct sata_device { | |||
171 | struct ata_port *ap; | 171 | struct ata_port *ap; |
172 | struct ata_host ata_host; | 172 | struct ata_host ata_host; |
173 | struct ata_taskfile tf; | 173 | struct ata_taskfile tf; |
174 | u32 sstatus; | ||
175 | u32 serror; | ||
176 | u32 scontrol; | ||
177 | }; | 174 | }; |
178 | 175 | ||
179 | /* ---------- Domain device ---------- */ | 176 | /* ---------- Domain device ---------- */ |
@@ -487,10 +484,6 @@ enum exec_status { | |||
487 | struct ata_task_resp { | 484 | struct ata_task_resp { |
488 | u16 frame_len; | 485 | u16 frame_len; |
489 | u8 ending_fis[24]; /* dev to host or data-in */ | 486 | u8 ending_fis[24]; /* dev to host or data-in */ |
490 | u32 sstatus; | ||
491 | u32 serror; | ||
492 | u32 scontrol; | ||
493 | u32 sactive; | ||
494 | }; | 487 | }; |
495 | 488 | ||
496 | #define SAS_STATUS_BUF_SIZE 96 | 489 | #define SAS_STATUS_BUF_SIZE 96 |