From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert Lee Subject: [PATCH/RFC 1/9] libata: remove irq_on from ata_bus_reset() and ata_std_postreset() Date: Fri, 15 Jun 2007 11:15:50 +0800 Message-ID: <46720466.6040909@tw.ibm.com> References: <46720353.90209@tw.ibm.com> Reply-To: albertl@mail.com Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from e34.co.us.ibm.com ([32.97.110.152]:48904 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751144AbXFODPz (ORCPT ); Thu, 14 Jun 2007 23:15:55 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e34.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id l5F3Ft5d028486 for ; Thu, 14 Jun 2007 23:15:55 -0400 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v8.3) with ESMTP id l5F3Fsre130702 for ; Thu, 14 Jun 2007 21:15:54 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l5F3Fsr1025909 for ; Thu, 14 Jun 2007 21:15:54 -0600 In-Reply-To: <46720353.90209@tw.ibm.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Linux IDE Cc: Doug Maxey Patch 1/9: It looks the calling of irq_on() in ata_bus_reset() and ata_std_postreset() are leftover of the earlier EDD reset. Remove them. Signed-off-by: Albert Lee --- diff -Nrup 00_libata-dev/drivers/ata/libata-core.c 01_remove_leftover_irqon/drivers/ata/libata-core.c --- 00_libata-dev/drivers/ata/libata-core.c 2007-06-01 12:08:21.000000000 +0800 +++ 01_remove_leftover_irqon/drivers/ata/libata-core.c 2007-06-11 17:31:53.000000000 +0800 @@ -3190,9 +3190,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); @@ -3577,10 +3574,6 @@ void ata_std_postreset(struct ata_port * 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); diff -Nrup 00_libata-dev/drivers/ata/pata_scc.c 01_remove_leftover_irqon/drivers/ata/pata_scc.c --- 00_libata-dev/drivers/ata/pata_scc.c 2007-06-01 12:08:21.000000000 +0800 +++ 01_remove_leftover_irqon/drivers/ata/pata_scc.c 2007-06-11 17:32:07.000000000 +0800 @@ -892,10 +892,6 @@ static void scc_std_postreset (struct at { 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);