Эх сурвалжийг харах

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: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Albert Lee 18 жил өмнө
parent
commit
c6e54a5781

+ 0 - 7
drivers/ata/libata-core.c

@@ -3164,9 +3164,6 @@ void ata_bus_reset(struct ata_port *ap)
 	if ((slave_possible) && (err != 0x81))
 	if ((slave_possible) && (err != 0x81))
 		ap->device[1].class = ata_dev_try_classify(ap, 1, &err);
 		ap->device[1].class = ata_dev_try_classify(ap, 1, &err);
 
 
-	/* re-enable interrupts */
-	ap->ops->irq_on(ap);
-
 	/* is double-select really necessary? */
 	/* is double-select really necessary? */
 	if (ap->device[1].class != ATA_DEV_NONE)
 	if (ap->device[1].class != ATA_DEV_NONE)
 		ap->ops->dev_select(ap, 1);
 		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)
 	if (sata_scr_read(ap, SCR_ERROR, &serror) == 0)
 		sata_scr_write(ap, SCR_ERROR, serror);
 		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? */
 	/* is double-select really necessary? */
 	if (classes[0] != ATA_DEV_NONE)
 	if (classes[0] != ATA_DEV_NONE)
 		ap->ops->dev_select(ap, 1);
 		ap->ops->dev_select(ap, 1);

+ 0 - 4
drivers/ata/pata_scc.c

@@ -912,10 +912,6 @@ static void scc_std_postreset (struct ata_port *ap, unsigned int *classes)
 {
 {
 	DPRINTK("ENTER\n");
 	DPRINTK("ENTER\n");
 
 
-	/* re-enable interrupts */
-	if (!ap->ops->error_handler)
-		ap->ops->irq_on(ap);
-
 	/* is double-select really necessary? */
 	/* is double-select really necessary? */
 	if (classes[0] != ATA_DEV_NONE)
 	if (classes[0] != ATA_DEV_NONE)
 		ap->ops->dev_select(ap, 1);
 		ap->ops->dev_select(ap, 1);