[PATCH 05/50] ide: call ide_pci_setup_ports() before do_ide_setup_pci_device()

Bartlomiej Zolnierkiewicz
2008-07-06T17:36:39Z

[-- Attachment #1: ide-call-ide_pci_setup_ports-before-do_ide_setup_pci_device.patch --]
[-- Type: text/plain, Size: 1464 bytes --]

* Call ide_pci_setup_ports() before do_ide_setup_pci_device()
in ide_setup_pci_device[s]().

While at it:

* Remove stale FIXMEs.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/setup-pci.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

Index: b/drivers/ide/setup-pci.c
===================================================================
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -533,14 +533,16 @@ int ide_setup_pci_device(struct pci_dev
if (ret < 0)
goto out;

+ ide_pci_setup_ports(dev, d, 0, &hw[0], &hws[0]);
+
ret = do_ide_setup_pci_device(dev, d, 1);
+ if (ret < 0)
+ goto out;

- if (ret >= 0) {
- /* FIXME: silent failure can happen */
- ide_pci_setup_ports(dev, d, ret, &hw[0], &hws[0]);
+ /* fixup IRQ */
+ hw[1].irq = hw[0].irq = ret;

- ret = ide_host_add(d, hws, NULL);
- }
+ ret = ide_host_add(d, hws, NULL);
out:
return ret;
}
@@ -558,6 +560,8 @@ int ide_setup_pci_devices(struct pci_dev
if (ret < 0)
goto out;

+ ide_pci_setup_ports(pdev[i], d, 0, &hw[i*2], &hws[i*2]);
+
ret = do_ide_setup_pci_device(pdev[i], d, !i);

/*
@@ -567,8 +571,8 @@ int ide_setup_pci_devices(struct pci_dev
if (ret < 0)
goto out;

- /* FIXME: silent failure can happen */
- ide_pci_setup_ports(pdev[i], d, ret, &hw[i*2], &hws[i*2]);
+ /* fixup IRQ */
+ hw[i*2 + 1].irq = hw[i*2].irq = ret;
}

ret = ide_host_add(d, hws, NULL);

--