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

Commit 6d32d30f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] Remove ->irq_ack() hook, and ata_dummy_irq_on() 



* ->irq_ack() is redundant to what the irq handler already
  performs... chk-status + irq-clear.  Furthermore, it is only
  called in one place, when screaming-irq-debugging is enabled,
  so we don't want to bother with a hook just for that.

* ata_dummy_irq_on() is only ever used in drivers that have
  no callpath reaching ->irq_on().  Remove .irq_on hook from
  those drivers, and the now-unused ata_dummy_irq_on()

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

drivers/ata/ahci.c

+0 −4
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ static const struct ata_port_operations ahci_ops = { 
	.qc_issue		= ahci_qc_issue,



	.irq_clear		= ahci_irq_clear,

	.irq_on			= ata_dummy_irq_on,

	.irq_ack		= ata_dummy_irq_ack,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,
@@ -310,8 +308,6 @@ static const struct ata_port_operations ahci_vt8251_ops = { 
	.qc_issue		= ahci_qc_issue,



	.irq_clear		= ahci_irq_clear,

	.irq_on			= ata_dummy_irq_on,

	.irq_ack		= ata_dummy_irq_ack,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,

drivers/ata/ata_generic.c

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ static struct ata_port_operations generic_port_ops = { 
	.irq_handler	= ata_interrupt,

	.irq_clear	= ata_bmdma_irq_clear,

	.irq_on		= ata_irq_on,

	.irq_ack	= ata_irq_ack,



	.port_start	= ata_port_start,

};

drivers/ata/ata_piix.c

+0 −3
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static const struct ata_port_operations piix_pata_ops = { 
	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,

	.irq_ack		= ata_irq_ack,



	.port_start		= ata_port_start,

};
@@ -352,7 +351,6 @@ static const struct ata_port_operations ich_pata_ops = { 
	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,

	.irq_ack		= ata_irq_ack,



	.port_start		= ata_port_start,

};
@@ -382,7 +380,6 @@ static const struct ata_port_operations piix_sata_ops = { 
	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,

	.irq_ack		= ata_irq_ack,



	.port_start		= ata_port_start,

};

drivers/ata/libata-core.c

+2 −4
Original line number Diff line number Diff line
@@ -5747,7 +5747,8 @@ inline unsigned int ata_host_intr (struct ata_port *ap, 


#ifdef ATA_IRQ_TRAP

	if ((ap->stats.idle_irq % 1000) == 0) {

		ap->ops->irq_ack(ap, 0); /* debug trap */

		ata_chk_status(ap);

		ap->ops->irq_clear(ap);

		ata_port_printk(ap, KERN_WARNING, "irq trap\n");

		return 1;

	}
@@ -7137,9 +7138,6 @@ EXPORT_SYMBOL_GPL(ata_eh_qc_complete); 
EXPORT_SYMBOL_GPL(ata_eh_qc_retry);

EXPORT_SYMBOL_GPL(ata_do_eh);

EXPORT_SYMBOL_GPL(ata_irq_on);

EXPORT_SYMBOL_GPL(ata_dummy_irq_on);

EXPORT_SYMBOL_GPL(ata_irq_ack);

EXPORT_SYMBOL_GPL(ata_dummy_irq_ack);

EXPORT_SYMBOL_GPL(ata_dev_try_classify);



EXPORT_SYMBOL_GPL(ata_cable_40wire);

drivers/ata/libata-sff.c

+0 −40
Original line number Diff line number Diff line
@@ -64,46 +64,6 @@ u8 ata_irq_on(struct ata_port *ap) 
	return tmp;

}



u8 ata_dummy_irq_on (struct ata_port *ap) 	{ return 0; }



/**

 *	ata_irq_ack - Acknowledge a device interrupt.

 *	@ap: Port on which interrupts are enabled.

 *

 *	Wait up to 10 ms for legacy IDE device to become idle (BUSY

 *	or BUSY+DRQ clear).  Obtain dma status and port status from

 *	device.  Clear the interrupt.  Return port status.

 *

 *	LOCKING:

 */



u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq)

{

	unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;

	u8 host_stat = 0, post_stat = 0, status;



	status = ata_busy_wait(ap, bits, 1000);

	if (status & bits)

		if (ata_msg_err(ap))

			printk(KERN_ERR "abnormal status 0x%X\n", status);



	if (ap->ioaddr.bmdma_addr) {

		/* get controller status; clear intr, err bits */

		host_stat = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);

		iowrite8(host_stat | ATA_DMA_INTR | ATA_DMA_ERR,

			 ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);



		post_stat = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);

	}

	if (ata_msg_intr(ap))

		printk(KERN_INFO "%s: irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n",

			__FUNCTION__,

			host_stat, post_stat, status);

	return status;

}



u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq) { return 0; }



/**

 *	ata_tf_load - send taskfile registers to host controller

 *	@ap: Port to which output is sent