lkml.org 
[lkml]   [2008]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 04/50] ide: move ide_setup_pci_controller() call to ide_setup_pci_device()
There should be no functional changes caused by this patch.

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

Index: b/drivers/ide/setup-pci.c
===================================================================
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -487,10 +487,6 @@ static int do_ide_setup_pci_device(struc
{
int pciirq, ret;

- ret = ide_setup_pci_controller(dev, d, noisy);
- if (ret < 0)
- goto out;
-
/*
* Can we trust the reported IRQ?
*/
@@ -533,6 +529,10 @@ int ide_setup_pci_device(struct pci_dev
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) {
@@ -541,7 +541,7 @@ int ide_setup_pci_device(struct pci_dev

ret = ide_host_add(d, hws, NULL);
}
-
+out:
return ret;
}
EXPORT_SYMBOL_GPL(ide_setup_pci_device);
@@ -554,6 +554,10 @@ int ide_setup_pci_devices(struct pci_dev
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);

/*
--



\
 
 \ /
  Last update: 2008-07-06 19:39    [W:0.027 / U:0.844 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site