lkml.org 
[lkml]   [2008]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] ide: move ide_pci_setup_ports() call out from do_ide_setup_pci_device()
Date
* 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>
---
against IDE tree + the recent ide-pmac patches

drivers/ide/setup-pci.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)

Index: b/drivers/ide/setup-pci.c
===================================================================
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -479,7 +479,7 @@ EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
*/
static int do_ide_setup_pci_device(struct pci_dev *dev,
const struct ide_port_info *d,
- u8 *idx, u8 noisy)
+ u8 noisy)
{
int tried_config = 0;
int pciirq, ret;
@@ -528,9 +528,7 @@ static int do_ide_setup_pci_device(struc
d->name, pciirq);
}

- /* FIXME: silent failure can happen */
-
- ide_pci_setup_ports(dev, d, pciirq, idx);
+ ret = pciirq;
out:
return ret;
}
@@ -540,10 +538,14 @@ int ide_setup_pci_device(struct pci_dev
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]);

- if (ret >= 0)
ide_device_add(idx, d);
+ }

return ret;
}
@@ -557,13 +559,17 @@ int ide_setup_pci_devices(struct pci_dev
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: silent failure can happen */
+ ide_pci_setup_ports(pdev[i], d, ret, &idx[i*2]);
}

ide_device_add(idx, d);

\
 
 \ /
  Last update: 2008-06-20 20:31    [W:0.022 / U:0.756 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site