From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 4/7] ide: move ide_setup_dma() call out from ->init_dma method Date: Sat, 8 Mar 2008 22:31:57 +0100 Message-ID: <200803082231.57531.bzolnier@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from ug-out-1314.google.com ([66.249.92.171]:55164 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752371AbYCHVVh (ORCPT ); Sat, 8 Mar 2008 16:21:37 -0500 Received: by ug-out-1314.google.com with SMTP id z38so4632681ugc.16 for ; Sat, 08 Mar 2008 13:21:36 -0800 (PST) Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/pci/alim15x3.c | 1 - drivers/ide/pci/hpt366.c | 2 -- drivers/ide/setup-pci.c | 7 +++---- 3 files changed, 3 insertions(+), 7 deletions(-) Index: b/drivers/ide/pci/alim15x3.c =================================================================== --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c @@ -734,7 +734,6 @@ static void __devinit init_dma_ali15x3 ( { if (!hwif->channel) outb(inb(dmabase + 2) & 0x60, dmabase + 2); - ide_setup_dma(hwif, dmabase); } static const struct ide_port_ops ali_port_ops = { Index: b/drivers/ide/pci/hpt366.c =================================================================== --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -1348,8 +1348,6 @@ static void __devinit init_dma_hpt366(id outb(dma_new, dmabase + 2); local_irq_restore(flags); - - ide_setup_dma(hwif, dmabase); } static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2) Index: b/drivers/ide/setup-pci.c =================================================================== --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -360,11 +360,10 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif } } if (dma_base) { - if (d->init_dma) { + if (d->init_dma) d->init_dma(hwif, dma_base); - } else { - ide_setup_dma(hwif, dma_base); - } + + ide_setup_dma(hwif, dma_base); } else { printk(KERN_INFO "%s: %s Bus-Master DMA disabled " "(BIOS)\n", hwif->name, d->name);