Commit 27ab3d70 authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] prep_pci.c: replace pci_find_device with pci_get_device

Signed-off-by: default avatarHanna Linder <hannal@us.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 97b8b774
...@@ -1069,7 +1069,7 @@ prep_pib_init(void) ...@@ -1069,7 +1069,7 @@ prep_pib_init(void)
* Perform specific configuration for the Via Tech or * Perform specific configuration for the Via Tech or
* or Winbond PCI-ISA-Bridge part. * or Winbond PCI-ISA-Bridge part.
*/ */
if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_1, dev))) { PCI_DEVICE_ID_VIA_82C586_1, dev))) {
/* /*
* PPCBUG does not set the enable bits * PPCBUG does not set the enable bits
...@@ -1080,7 +1080,7 @@ prep_pib_init(void) ...@@ -1080,7 +1080,7 @@ prep_pib_init(void)
reg |= 0x03; /* IDE: Chip Enable Bits */ reg |= 0x03; /* IDE: Chip Enable Bits */
pci_write_config_byte(dev, 0x40, reg); pci_write_config_byte(dev, 0x40, reg);
} }
if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_2, PCI_DEVICE_ID_VIA_82C586_2,
dev)) && (dev->devfn = 0x5a)) { dev)) && (dev->devfn = 0x5a)) {
/* Force correct USB interrupt */ /* Force correct USB interrupt */
...@@ -1089,7 +1089,7 @@ prep_pib_init(void) ...@@ -1089,7 +1089,7 @@ prep_pib_init(void)
PCI_INTERRUPT_LINE, PCI_INTERRUPT_LINE,
dev->irq); dev->irq);
} }
if ((dev = pci_find_device(PCI_VENDOR_ID_WINBOND, if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,
PCI_DEVICE_ID_WINBOND_83C553, dev))) { PCI_DEVICE_ID_WINBOND_83C553, dev))) {
/* Clear PCI Interrupt Routing Control Register. */ /* Clear PCI Interrupt Routing Control Register. */
short_reg = 0x0000; short_reg = 0x0000;
...@@ -1100,9 +1100,10 @@ prep_pib_init(void) ...@@ -1100,9 +1100,10 @@ prep_pib_init(void)
pci_write_config_byte(dev, 0x43, reg); pci_write_config_byte(dev, 0x43, reg);
} }
} }
pci_dev_put(dev);
} }
if ((dev = pci_find_device(PCI_VENDOR_ID_WINBOND, if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,
PCI_DEVICE_ID_WINBOND_82C105, dev))){ PCI_DEVICE_ID_WINBOND_82C105, dev))){
if (OpenPIC_Addr){ if (OpenPIC_Addr){
/* /*
...@@ -1121,6 +1122,7 @@ prep_pib_init(void) ...@@ -1121,6 +1122,7 @@ prep_pib_init(void)
pci_write_config_dword(dev, 0x40, 0x10ff08a1); pci_write_config_dword(dev, 0x40, 0x10ff08a1);
} }
} }
pci_dev_put(dev);
} }
static void __init static void __init
...@@ -1207,7 +1209,7 @@ prep_pcibios_fixup(void) ...@@ -1207,7 +1209,7 @@ prep_pcibios_fixup(void)
printk("Setting PCI interrupts for a \"%s\"\n", Motherboard_map_name); printk("Setting PCI interrupts for a \"%s\"\n", Motherboard_map_name);
/* Iterate through all the PCI devices, setting the IRQ */ /* Iterate through all the PCI devices, setting the IRQ */
while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { for_each_pci_dev(dev) {
/* /*
* If we have residual data, then this is easy: query the * If we have residual data, then this is easy: query the
* residual data for the IRQ line allocated to the device. * residual data for the IRQ line allocated to the device.
...@@ -1260,12 +1262,13 @@ prep_pcibios_after_init(void) ...@@ -1260,12 +1262,13 @@ prep_pcibios_after_init(void)
* instead of 0xc0000. vgacon.c (for example) is completely unaware of * instead of 0xc0000. vgacon.c (for example) is completely unaware of
* this little quirk. * this little quirk.
*/ */
dev = pci_find_device(PCI_VENDOR_ID_WD, PCI_DEVICE_ID_WD_90C, NULL); dev = pci_get_device(PCI_VENDOR_ID_WD, PCI_DEVICE_ID_WD_90C, NULL);
if (dev) { if (dev) {
dev->resource[1].end -= dev->resource[1].start; dev->resource[1].end -= dev->resource[1].start;
dev->resource[1].start = 0; dev->resource[1].start = 0;
/* tell the hardware */ /* tell the hardware */
pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0x0); pci_write_config_dword(dev, PCI_BASE_ADDRESS_1, 0x0);
pci_dev_put(dev);
} }
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment