Commit 48d68773 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

[PATCH] PCI: pci_find_device remove (ppc/platforms/85xx/mpc85xx_cds_common.c)

Signed-off-by: default avatarJiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cee02953
...@@ -351,10 +351,10 @@ mpc85xx_cds_fixup_via(struct pci_controller *hose) ...@@ -351,10 +351,10 @@ mpc85xx_cds_fixup_via(struct pci_controller *hose)
void __init void __init
mpc85xx_cds_pcibios_fixup(void) mpc85xx_cds_pcibios_fixup(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev;
u_char c; u_char c;
if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_1, NULL))) { PCI_DEVICE_ID_VIA_82C586_1, NULL))) {
/* /*
* U-Boot does not set the enable bits * U-Boot does not set the enable bits
...@@ -371,21 +371,24 @@ mpc85xx_cds_pcibios_fixup(void) ...@@ -371,21 +371,24 @@ mpc85xx_cds_pcibios_fixup(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);
} }
/* /*
* Force legacy USB interrupt routing * Force legacy USB interrupt routing
*/ */
if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_2, NULL))) { PCI_DEVICE_ID_VIA_82C586_2, NULL))) {
dev->irq = 10; dev->irq = 10;
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
pci_dev_put(dev);
} }
if ((dev = pci_find_device(PCI_VENDOR_ID_VIA, if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_2, dev))) { PCI_DEVICE_ID_VIA_82C586_2, dev))) {
dev->irq = 11; dev->irq = 11;
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);
pci_dev_put(dev);
} }
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
......
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