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

Commit ac8869d5 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Remove ->port_disable() hook 



It was always set to ata_port_disable().  Removed the hook, and replaced
the very few ap->ops->port_disable() callsites with direct calls to
ata_port_disable().

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7d73a363

drivers/ata/ahci.c

+0 −4
Original line number Diff line number Diff line
@@ -264,8 +264,6 @@ static struct scsi_host_template ahci_sht = { 
};



static const struct ata_port_operations ahci_ops = {

	.port_disable		= ata_port_disable,



	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,
@@ -296,8 +294,6 @@ static const struct ata_port_operations ahci_ops = { 
};



static const struct ata_port_operations ahci_vt8251_ops = {

	.port_disable		= ata_port_disable,



	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,

drivers/ata/ata_generic.c

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static struct scsi_host_template generic_sht = { 
static struct ata_port_operations generic_port_ops = {

	.set_mode	= generic_set_mode,



	.port_disable	= ata_port_disable,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,

	.check_status 	= ata_check_status,

drivers/ata/ata_piix.c

+0 −4
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ static struct scsi_host_template piix_sht = { 
};



static const struct ata_port_operations piix_pata_ops = {

	.port_disable		= ata_port_disable,

	.set_piomode		= piix_set_piomode,

	.set_dmamode		= piix_set_dmamode,

	.mode_filter		= ata_pci_default_filter,
@@ -323,7 +322,6 @@ static const struct ata_port_operations piix_pata_ops = { 
};



static const struct ata_port_operations ich_pata_ops = {

	.port_disable		= ata_port_disable,

	.set_piomode		= piix_set_piomode,

	.set_dmamode		= ich_set_dmamode,

	.mode_filter		= ata_pci_default_filter,
@@ -356,8 +354,6 @@ static const struct ata_port_operations ich_pata_ops = { 
};



static const struct ata_port_operations piix_sata_ops = {

	.port_disable		= ata_port_disable,



	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

drivers/ata/libata-core.c

+1 −3
Original line number Diff line number Diff line
@@ -2208,7 +2208,6 @@ int ata_bus_probe(struct ata_port *ap) 


	/* no device present, disable port */

	ata_port_disable(ap);

	ap->ops->port_disable(ap);

	return -ENODEV;



 fail:
@@ -3227,7 +3226,7 @@ void ata_bus_reset(struct ata_port *ap) 


err_out:

	ata_port_printk(ap, KERN_ERR, "disabling port\n");

	ap->ops->port_disable(ap);

	ata_port_disable(ap);



	DPRINTK("EXIT\n");

}
@@ -6986,7 +6985,6 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc) 
}



const struct ata_port_operations ata_dummy_port_ops = {

	.port_disable		= ata_port_disable,

	.check_status		= ata_dummy_check_status,

	.check_altstatus	= ata_dummy_check_status,

	.dev_select		= ata_noop_dev_select,

drivers/ata/pata_ali.c

+0 −5
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static struct scsi_host_template ali_sht = { 
 */



static struct ata_port_operations ali_early_port_ops = {

	.port_disable	= ata_port_disable,

	.set_piomode	= ali_set_piomode,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,
@@ -336,8 +335,6 @@ static struct ata_port_operations ali_early_port_ops = { 
 *	detect

 */

static struct ata_port_operations ali_20_port_ops = {

	.port_disable	= ata_port_disable,



	.set_piomode	= ali_set_piomode,

	.set_dmamode	= ali_set_dmamode,

	.mode_filter	= ali_20_filter,
@@ -376,7 +373,6 @@ static struct ata_port_operations ali_20_port_ops = { 
 *	Port operations for DMA capable ALi with cable detect

 */

static struct ata_port_operations ali_c2_port_ops = {

	.port_disable	= ata_port_disable,

	.set_piomode	= ali_set_piomode,

	.set_dmamode	= ali_set_dmamode,

	.mode_filter	= ata_pci_default_filter,
@@ -414,7 +410,6 @@ static struct ata_port_operations ali_c2_port_ops = { 
 *	Port operations for DMA capable ALi with cable detect and LBA48

 */

static struct ata_port_operations ali_c5_port_ops = {

	.port_disable	= ata_port_disable,

	.set_piomode	= ali_set_piomode,

	.set_dmamode	= ali_set_dmamode,

	.mode_filter	= ata_pci_default_filter,