From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 9/9] ide: remove superfluous ->waiting_for_dma checks Date: Sun, 17 Aug 2008 19:15:56 +0200 Message-ID: <20080817171556.27943.29369.sendpatchset@localhost.localdomain> References: <20080817171454.27943.37234.sendpatchset@localhost.localdomain> Return-path: Received: from mu-out-0910.google.com ([209.85.134.186]:30252 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755420AbYHQRSR (ORCPT ); Sun, 17 Aug 2008 13:18:17 -0400 Received: by mu-out-0910.google.com with SMTP id w8so2799973mue.1 for ; Sun, 17 Aug 2008 10:18:16 -0700 (PDT) In-Reply-To: <20080817171454.27943.37234.sendpatchset@localhost.localdomain> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-dma.c | 4 +--- drivers/ide/mips/au1xxx-ide.c | 6 +----- drivers/ide/pci/hpt366.c | 3 --- drivers/ide/pci/scc_pata.c | 3 --- drivers/ide/ppc/pmac.c | 3 --- 5 files changed, 2 insertions(+), 17 deletions(-) Index: b/drivers/ide/ide-dma.c =================================================================== --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -578,9 +578,7 @@ int ide_dma_test_irq(ide_drive_t *drive) /* return 1 if INTR asserted */ if ((dma_stat & 4) == 4) return 1; - if (!drive->waiting_for_dma) - printk(KERN_WARNING "%s: (%s) called while not waiting\n", - drive->name, __func__); + return 0; } EXPORT_SYMBOL_GPL(ide_dma_test_irq); Index: b/drivers/ide/mips/au1xxx-ide.c =================================================================== --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c @@ -322,11 +322,7 @@ static int auide_dma_setup(ide_drive_t * } static int auide_dma_test_irq(ide_drive_t *drive) -{ - if (drive->waiting_for_dma == 0) - printk(KERN_WARNING "%s: ide_dma_test_irq \ - called while not waiting\n", drive->name); - +{ /* If dbdma didn't execute the STOP command yet, the * active bit is still set */ Index: b/drivers/ide/pci/hpt366.c =================================================================== --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -861,9 +861,6 @@ static int hpt374_dma_test_irq(ide_drive if (dma_stat & 4) return 1; - if (!drive->waiting_for_dma) - printk(KERN_WARNING "%s: (%s) called while not waiting\n", - drive->name, __func__); return 0; } Index: b/drivers/ide/pci/scc_pata.c =================================================================== --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c @@ -509,9 +509,6 @@ static int scc_dma_test_irq(ide_drive_t if (int_stat & INTSTS_IOIRQS) return 1; - if (!drive->waiting_for_dma) - printk(KERN_WARNING "%s: (%s) called while not waiting\n", - drive->name, __func__); return 0; } Index: b/drivers/ide/ppc/pmac.c =================================================================== --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1672,9 +1672,6 @@ pmac_ide_dma_test_irq (ide_drive_t *driv status = readl(&dma->status); if (!(status & ACTIVE)) return 1; - if (!drive->waiting_for_dma) - printk(KERN_WARNING "ide%d, ide_dma_test_irq \ - called while not waiting\n", HWIF(drive)->index); /* If dbdma didn't execute the STOP command yet, the * active bit is still set. We consider that we aren't