Re: [PATCH] PCI fixes for 2.6.10-rc1

Greg KH
2004-11-12T23:41:53Z

ChangeSet 1.2091.1.21, 2004/11/12 14:11:07-08:00, hannal@us.ibm.com

[PATCH] mcpn765.c: replace pci_find_device with pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

arch/ppc/platforms/mcpn765.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff -Nru a/arch/ppc/platforms/mcpn765.c b/arch/ppc/platforms/mcpn765.c
--- a/arch/ppc/platforms/mcpn765.c 2004-11-12 15:09:26 -08:00
+++ b/arch/ppc/platforms/mcpn765.c 2004-11-12 15:09:27 -08:00
@@ -185,7 +185,7 @@
struct pci_dev *dev;
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_0,
NULL)) == NULL) {
printk("No VIA ISA bridge found\n");
@@ -209,8 +209,8 @@
pci_write_config_dword(dev, 0x54, 0);
pci_write_config_byte(dev, 0x58, 0);

-
- if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+ pci_dev_put(dev);
+ if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C586_1,
NULL)) == NULL) {
printk("No VIA ISA bridge found\n");
@@ -225,6 +225,7 @@
pci_read_config_byte(dev, 0x40, &c);
c |= 0x03;
pci_write_config_byte(dev, 0x40, c);
+ pci_dev_put(dev);

return;
}