3.2.100-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Dan Williams <[email protected]> commit 95ac7fd189b7e81a200b4d00b2bb6669b31acf3a upstream. 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 <[email protected]> Signed-off-by: Dan Williams <[email protected]> Signed-off-by: James Bottomley <[email protected]> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <[email protected]> --- drivers/scsi/libsas/sas_ata.c | 4 ---- include/scsi/libsas.h | 7 ------- 2 files changed, 11 deletions(-) --- 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 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) { --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -173,9 +173,6 @@ struct sata_device { struct ata_port *ap; struct ata_host ata_host; u8 fis[ATA_RESP_FIS_SIZE]; - u32 sstatus; - u32 serror; - u32 scontrol; }; /* ---------- Domain device ---------- */ @@ -492,10 +489,6 @@ enum exec_status { struct ata_task_resp { u16 frame_len; u8 ending_fis[ATA_RESP_FIS_SIZE]; /* dev to host or data-in */ - u32 sstatus; - u32 serror; - u32 scontrol; - u32 sactive; }; #define SAS_STATUS_BUF_SIZE 96
