From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: [PATCH 04/50] ide: move ide_setup_pci_controller() call to ide_setup_pci_device() Date: Sun, 06 Jul 2008 19:20:14 +0200 Message-ID: <48710231.1ade660a.3458.626e@mx.google.com> References: <20080706172010.559358957@bzolnier@gmail.com> Return-path: Received: from gv-out-0910.google.com ([216.239.58.187]:49197 "EHLO gv-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755699AbYGFReq (ORCPT ); Sun, 6 Jul 2008 13:34:46 -0400 Received: by gv-out-0910.google.com with SMTP id e6so309131gvc.37 for ; Sun, 06 Jul 2008 10:34:42 -0700 (PDT) Content-Disposition: inline; filename=ide-move-ide_setup_pci_controller-call-to-ide_setup_pci_device-s.patch 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/setup-pci.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Index: b/drivers/ide/setup-pci.c =================================================================== --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -487,10 +487,6 @@ static int do_ide_setup_pci_device(struc { int pciirq, ret; - ret = ide_setup_pci_controller(dev, d, noisy); - if (ret < 0) - goto out; - /* * Can we trust the reported IRQ? */ @@ -533,6 +529,10 @@ int ide_setup_pci_device(struct pci_dev hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL }; int ret; + ret = ide_setup_pci_controller(dev, d, 1); + if (ret < 0) + goto out; + ret = do_ide_setup_pci_device(dev, d, 1); if (ret >= 0) { @@ -541,7 +541,7 @@ int ide_setup_pci_device(struct pci_dev ret = ide_host_add(d, hws, NULL); } - +out: return ret; } EXPORT_SYMBOL_GPL(ide_setup_pci_device); @@ -554,6 +554,10 @@ int ide_setup_pci_devices(struct pci_dev hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL }; for (i = 0; i < 2; i++) { + ret = ide_setup_pci_controller(pdev[i], d, !i); + if (ret < 0) + goto out; + ret = do_ide_setup_pci_device(pdev[i], d, !i); /* --