diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 22:53:12 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 22:53:12 +0200 |
| commit | a742d6cf0b37b1a96a1549b1fda0d6b19e0185c2 (patch) | |
| tree | fef538fa41fdded0b3644d3e39c1a34d667d3f22 /drivers/ide/setup-pci.c | |
| parent | ide: respect dev->irq in do_ide_setup_pci_device() also if 'tried_config' (diff) | |
| download | linux-a742d6cf0b37b1a96a1549b1fda0d6b19e0185c2.tar.xz linux-a742d6cf0b37b1a96a1549b1fda0d6b19e0185c2.zip | |
ide: move ide_setup_pci_controller() call to ide_setup_pci_device[s]()
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/setup-pci.c')
| -rw-r--r-- | drivers/ide/setup-pci.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 58f4a95f6f5c..98c663d62b9f 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -488,10 +488,6 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, { int pciirq, ret; - ret = ide_setup_pci_controller(dev, d, noisy); - if (ret < 0) - goto out; - /* * Can we trust the reported IRQ? */ @@ -534,6 +530,10 @@ int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d) 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) { @@ -542,7 +542,7 @@ int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d) ret = ide_host_add(d, hws, NULL); } - +out: return ret; } EXPORT_SYMBOL_GPL(ide_setup_pci_device); @@ -555,6 +555,10 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2, 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); /* |