Commit c6e54a57 authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

libata: remove irq_on from ata_bus_reset() and ata_std_postreset() 



  It seems irq_on() in ata_bus_reset() and ata_std_postreset()
are leftover of the EDD reset. Remove them.

Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e04b3b9d

drivers/ata/libata-core.c

+0 −7
Original line number Diff line number Diff line
@@ -3164,9 +3164,6 @@ void ata_bus_reset(struct ata_port *ap) 
	if ((slave_possible) && (err != 0x81))

		ap->device[1].class = ata_dev_try_classify(ap, 1, &err);



	/* re-enable interrupts */

	ap->ops->irq_on(ap);



	/* is double-select really necessary? */

	if (ap->device[1].class != ATA_DEV_NONE)

		ap->ops->dev_select(ap, 1);
@@ -3551,10 +3548,6 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes) 
	if (sata_scr_read(ap, SCR_ERROR, &serror) == 0)

		sata_scr_write(ap, SCR_ERROR, serror);



	/* re-enable interrupts */

	if (!ap->ops->error_handler)

		ap->ops->irq_on(ap);



	/* is double-select really necessary? */

	if (classes[0] != ATA_DEV_NONE)

		ap->ops->dev_select(ap, 1);

drivers/ata/pata_scc.c

+0 −4
Original line number Diff line number Diff line
@@ -912,10 +912,6 @@ static void scc_std_postreset (struct ata_port *ap, unsigned int *classes) 
{

	DPRINTK("ENTER\n");



	/* re-enable interrupts */

	if (!ap->ops->error_handler)

		ap->ops->irq_on(ap);



	/* is double-select really necessary? */

	if (classes[0] != ATA_DEV_NONE)

		ap->ops->dev_select(ap, 1);