[PATCH 03/50] ide: respect dev->irq in do_ide_setup_pci_device() also if tried_config

Bartlomiej Zolnierkiewicz
2008-07-06T17:37:25Z

[-- Attachment #1: ide-respect-dev-irq-in-do_ide_setup_pci_device-also-if-tried_config.patch --]
[-- Type: text/plain, Size: 2057 bytes --]

* If device is in the PCI native mode respect dev->irq regardless of
'tried_config' in do_ide_setup_pci_device().

* Drop no longer needed 'config' argument from ide_setup_pci_controller().

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

Index: b/drivers/ide/setup-pci.c
===================================================================
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -392,14 +392,14 @@ int ide_hwif_setup_dma(ide_hwif_t *hwif,
* @dev: PCI device
* @d: IDE port info
* @noisy: verbose flag
- * @config: returned as 1 if we configured the hardware
*
* Set up the PCI and controller side of the IDE interface. This brings
* up the PCI side of the device, checks that the device is enabled
* and enables it if need be
*/

-static int ide_setup_pci_controller(struct pci_dev *dev, const struct ide_port_info *d, int noisy, int *config)
+static int ide_setup_pci_controller(struct pci_dev *dev,
+ const struct ide_port_info *d, int noisy)
{
int ret;
u16 pcicmd;
@@ -420,7 +420,6 @@ static int ide_setup_pci_controller(stru
ret = ide_pci_configure(dev, d);
if (ret < 0)
goto out;
- *config = 1;
printk(KERN_INFO "%s: device enabled (Linux)\n", d->name);
}

@@ -486,10 +485,9 @@ static int do_ide_setup_pci_device(struc
const struct ide_port_info *d,
u8 noisy)
{
- int tried_config = 0;
int pciirq, ret;

- ret = ide_setup_pci_controller(dev, d, noisy, &tried_config);
+ ret = ide_setup_pci_controller(dev, d, noisy);
if (ret < 0)
goto out;

@@ -514,10 +512,6 @@ static int do_ide_setup_pci_device(struc
printk(KERN_INFO "%s: not 100%% native mode: "
"will probe irqs later\n", d->name);
pciirq = ret;
- } else if (tried_config) {
- if (noisy)
- printk(KERN_INFO "%s: will probe irqs later\n", d->name);
- pciirq = 0;
} else if (!pciirq) {
if (noisy)
printk(KERN_WARNING "%s: bad irq (%d): will probe later\n",

--