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

Commit 1e34c838 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] libsas: remove spurious sata control register read/write 



Originally, libata required the illusion that it could access the sata
control register.  Now, however, it can run perfectly well without
them, so remove the dummy routines from libsas which tried to emulate
them (but only ended up causing confusion).

Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 96db6fa9

drivers/scsi/libsas/sas_ata.c

+0 −51
Original line number Diff line number Diff line
@@ -301,55 +301,6 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc) 
	}

}



static int sas_ata_scr_write(struct ata_link *link, unsigned int sc_reg_in,

			      u32 val)

{

	struct domain_device *dev = link->ap->private_data;



	SAS_DPRINTK("STUB %s\n", __func__);

	switch (sc_reg_in) {

		case SCR_STATUS:

			dev->sata_dev.sstatus = val;

			break;

		case SCR_CONTROL:

			dev->sata_dev.scontrol = val;

			break;

		case SCR_ERROR:

			dev->sata_dev.serror = val;

			break;

		case SCR_ACTIVE:

			dev->sata_dev.ap->link.sactive = val;

			break;

		default:

			return -EINVAL;

	}

	return 0;

}



static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,

			    u32 *val)

{

	struct domain_device *dev = link->ap->private_data;



	SAS_DPRINTK("STUB %s\n", __func__);

	switch (sc_reg_in) {

		case SCR_STATUS:

			*val = dev->sata_dev.sstatus;

			return 0;

		case SCR_CONTROL:

			*val = dev->sata_dev.scontrol;

			return 0;

		case SCR_ERROR:

			*val = dev->sata_dev.serror;

			return 0;

		case SCR_ACTIVE:

			*val = dev->sata_dev.ap->link.sactive;

			return 0;

		default:

			return -EINVAL;

	}

}



static struct ata_port_operations sas_sata_ops = {

	.phy_reset		= sas_ata_phy_reset,

	.post_internal_cmd	= sas_ata_post_internal,
@@ -359,8 +310,6 @@ static struct ata_port_operations sas_sata_ops = { 
	.qc_fill_rtf		= sas_ata_qc_fill_rtf,

	.port_start		= ata_sas_port_start,

	.port_stop		= ata_sas_port_stop,

	.scr_read		= sas_ata_scr_read,

	.scr_write		= sas_ata_scr_write

};



static struct ata_port_info sata_port_info = {