Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ac7fd1 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[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: default avatarJack Wang <jack_wang@usish.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 18a4d0a2

drivers/scsi/libsas/sas_ata.c

+0 −4
Original line number Diff line number Diff line
@@ -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) {

include/scsi/libsas.h

+0 −7
Original line number Diff line number Diff line
@@ -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