chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Use pci_get_device instead of deprecated pci_find_device

Browse Source 
Add compatibility code for Linux < 2.5.73.
This commit is contained in:
guillemj
2008-06-22 07:43:39 +00:00
parent 2952168561
commit 2832abfc79
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Device3Dfx/3dfx_driver.c
View File

@@ -144,6 +144,10 @@
#define PCI_DEVICE_ID_3DFX_VOODOO4 9
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,73)
#define pci_get_device pci_find_device
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static char name_3dfx[] = "3dfx";
@@ -252,7 +256,7 @@ static void findCardType(int vendor, int device)
{
struct pci_dev *dev = NULL;
while (numCards < MAXCARDS && (dev = pci_find_device(vendor, device, dev))) {
while (numCards < MAXCARDS && (dev = pci_get_device(vendor, device, dev))) {
pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &cards[numCards].addr0);
pci_read_config_dword(dev, PCI_BASE_ADDRESS_1, &cards[numCards].addr1);
pci_read_config_dword(dev, PCI_BASE_ADDRESS_2, &cards[numCards].addr2);
@@ -656,8 +660,8 @@ static int setmtrr_3dfx(void)
* First do a bios fixup if this system has a 82441FX chipset.
*/
struct pci_dev *dev = NULL;
dev = pci_find_device(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82371SB_0, dev);
dev = pci_get_device(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82371SB_0, dev);
if (dev) {
pci_read_config_byte(dev, 0x82, &dlc);
if (!(dlc & 1 << 1)) {

7
Device3Dfx/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-06-22 Guillem Jover <guillem@hadrons.org>
* 3dfx_driver.c (pci_get_device): On Linux < 2.5.73 define it as
pci_find_device.
(findCardType, setmtrr_3dfx): Use pci_get_device instead of deprecated
pci_find_device.
2008-06-22 Guillem Jover <guillem@hadrons.org>
* 3dfx_driver.c (cleanup_module): Ignore return value from