Commit 97b8b774 authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] pplus.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 b36d9bf7
...@@ -359,7 +359,7 @@ void __init pplus_pib_init(void) ...@@ -359,7 +359,7 @@ void __init pplus_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
...@@ -371,7 +371,7 @@ void __init pplus_pib_init(void) ...@@ -371,7 +371,7 @@ void __init pplus_pib_init(void)
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 */
...@@ -379,7 +379,7 @@ void __init pplus_pib_init(void) ...@@ -379,7 +379,7 @@ void __init pplus_pib_init(void)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 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;
...@@ -389,7 +389,7 @@ void __init pplus_pib_init(void) ...@@ -389,7 +389,7 @@ void __init pplus_pib_init(void)
pci_write_config_byte(dev, 0x43, reg); pci_write_config_byte(dev, 0x43, reg);
} }
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))) {
/* /*
* Disable LEGIRQ mode so PCI INTS are routed * Disable LEGIRQ mode so PCI INTS are routed
...@@ -401,6 +401,7 @@ void __init pplus_pib_init(void) ...@@ -401,6 +401,7 @@ void __init pplus_pib_init(void)
dev->irq = 14; dev->irq = 14;
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
} }
pci_dev_put(dev);
} }
void __init pplus_set_VIA_IDE_legacy(void) void __init pplus_set_VIA_IDE_legacy(void)
......
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