* Move ide_pci_setup_ports() call out from do_ide_setup_pci_device()
to ide_setup_pci_device[s]().
* Drop no longer needed idx argument from do_ide_setup_pci_device().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
*/
static int do_ide_setup_pci_device(struct pci_dev *dev,
const struct ide_port_info *d,
*/
static int do_ide_setup_pci_device(struct pci_dev *dev,
const struct ide_port_info *d,
{
int tried_config = 0;
int pciirq, ret;
{
int tried_config = 0;
int pciirq, ret;
- /* FIXME: silent failure can happen */
-
- ide_pci_setup_ports(dev, d, pciirq, idx);
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
int ret;
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
int ret;
- ret = do_ide_setup_pci_device(dev, d, &idx[0], 1);
+ ret = do_ide_setup_pci_device(dev, d, 1);
+
+ if (ret >= 0) {
+ /* FIXME: silent failure can happen */
+ ide_pci_setup_ports(dev, d, ret, &idx[0]);
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
for (i = 0; i < 2; i++) {
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
for (i = 0; i < 2; i++) {
- ret = do_ide_setup_pci_device(pdev[i], d, &idx[i*2], !i);
+ ret = do_ide_setup_pci_device(pdev[i], d, !i);
+
/*
* FIXME: Mom, mom, they stole me the helper function to undo
* do_ide_setup_pci_device() on the first device!
*/
if (ret < 0)
goto out;
/*
* FIXME: Mom, mom, they stole me the helper function to undo
* do_ide_setup_pci_device() on the first device!
*/
if (ret < 0)
goto out;
+
+ /* FIXME: silent failure can happen */
+ ide_pci_setup_ports(pdev[i], d, ret, &idx[i*2]);
}
ide_device_add(idx, d);
}
ide_device_add(idx, d);