hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-24 22:53:12 +02:00
parent a95925a309
commit a742d6cf0b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/ide/setup-pci.c
View File

@ -488,10 +488,6 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
{ {
int pciirq, ret; int pciirq, ret;
ret = ide_setup_pci_controller(dev, d, noisy);
if (ret < 0)
goto out;
/* /*
* Can we trust the reported IRQ? * 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 }; hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
int ret; int ret;
ret = ide_setup_pci_controller(dev, d, 1);
if (ret < 0)
goto out;
ret = do_ide_setup_pci_device(dev, d, 1); ret = do_ide_setup_pci_device(dev, d, 1);
if (ret >= 0) { 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); ret = ide_host_add(d, hws, NULL);
} }
out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_device); 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 }; hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
for (i = 0; i < 2; i++) { 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); ret = do_ide_setup_pci_device(pdev[i], d, !i);
/* /*