Commit 48bc3d9b authored by Hanna V. Linder's avatar Hanna V. Linder Committed by Greg Kroah-Hartman

[PATCH] matroxfb_base.c: convert pci_find_device to pci_get_device

As pci_find_device is going away I've replaced it 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 8206d06e
...@@ -1580,6 +1580,11 @@ static int initMatrox2(WPMINFO struct board* b){ ...@@ -1580,6 +1580,11 @@ static int initMatrox2(WPMINFO struct board* b){
unsigned int memsize; unsigned int memsize;
int err; int err;
static struct pci_device_id intel_82437[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437) },
{ },
};
DBG(__FUNCTION__) DBG(__FUNCTION__)
/* set default values... */ /* set default values... */
...@@ -1684,7 +1689,7 @@ static int initMatrox2(WPMINFO struct board* b){ ...@@ -1684,7 +1689,7 @@ static int initMatrox2(WPMINFO struct board* b){
mga_option |= MX_OPTION_BSWAP; mga_option |= MX_OPTION_BSWAP;
/* disable palette snooping */ /* disable palette snooping */
cmd &= ~PCI_COMMAND_VGA_PALETTE; cmd &= ~PCI_COMMAND_VGA_PALETTE;
if (pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, NULL)) { if (pci_dev_present(intel_82437)) {
if (!(mga_option & 0x20000000) && !ACCESS_FBINFO(devflags.nopciretry)) { if (!(mga_option & 0x20000000) && !ACCESS_FBINFO(devflags.nopciretry)) {
printk(KERN_WARNING "matroxfb: Disabling PCI retries due to i82437 present\n"); printk(KERN_WARNING "matroxfb: Disabling PCI retries due to i82437 present\n");
} }
......
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