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

Rename functions obsoleted in linux 2.1.93.

Browse Source 
* 3dfx_device.c (pcibios_read_config_byte): Rename to ...
	(pci_read_config_byte): ... this and remove first argument.
	(pcibios_read_config_word): Rename to ...
	(pci_read_config_word): ... this and remove first argument.
	(pcibios_read_config_dword): Rename to ...
	(pci_read_config_dword): ... this and remove first argument.
	(pcibios_write_config_dword): Rename to ...
	(pci_write_config_dword): ... this and remove first argument.
This commit is contained in:
guillemj
2006-12-03 06:50:14 +00:00
parent 526262f4a6
commit 054807b1dd
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Device3Dfx/3dfx_driver.c
View File

@@ -141,12 +141,6 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
static char name_3dfx[] = "3dfx";
#define pcibios_read_config_byte(x,y,z,w) pci_read_config_byte(y,z,w)
#define pcibios_read_config_word(x,y,z,w) pci_read_config_word(y,z,w)
#define pcibios_read_config_dword(x,y,z,w) pci_read_config_dword(y,z,w)
#define pcibios_write_config_dword(x,y,z,w) pci_write_config_dword(y,z,w)
#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) */
static struct pci_card {
unsigned short vendor;
@@ -394,15 +388,15 @@ static int doQueryFetch(pioData *desc)
switch (desc->size) {
case 1:
pcibios_read_config_byte(cards[desc->device].bus, cards[desc->device].dev, desc->port, &retchar);
pci_read_config_byte(cards[desc->device].dev, desc->port, &retchar);
copy_to_user(desc->value, &retchar, 1);
break;
case 2:
pcibios_read_config_word(cards[desc->device].bus, cards[desc->device].dev, desc->port, &retword);
pci_read_config_word(cards[desc->device].dev, desc->port, &retword);
copy_to_user(desc->value, &retword, 2);
break;
case 4:
pcibios_read_config_dword(cards[desc->device].bus, cards[desc->device].dev, desc->port, &retlong);
pci_read_config_dword(cards[desc->device].dev, desc->port, &retlong);
copy_to_user(desc->value, &retlong, 4);
break;
default:
@@ -451,7 +445,7 @@ static int doQueryUpdate(pioData *desc)
return -EINVAL;
}
pcibios_read_config_dword(cards[desc->device].bus, cards[desc->device].dev, desc->port & ~0x3, &retval);
pci_read_config_dword(cards[desc->device].dev, desc->port & ~0x3, &retval);
switch (desc->size) {
case 1:
copy_from_user(&retchar, desc->value, 1);
@@ -473,7 +467,7 @@ static int doQueryUpdate(pioData *desc)
}
retval = (retval & ~mask) | preval;
pcibios_write_config_dword(cards[desc->device].bus, cards[desc->device].dev, desc->port, retval);
pci_write_config_dword(cards[desc->device].bus, cards[desc->device].dev, desc->port, retval);
return 0;
}

13
Device3Dfx/ChangeLog
View File

@@ -1,3 +1,16 @@
2006-12-03 Guillem Jover <guillem@hadrons.org>
Rename functions obsoleted in linux 2.1.93.
* 3dfx_device.c (pcibios_read_config_byte): Rename to ...
(pci_read_config_byte): ... this and remove first argument.
(pcibios_read_config_word): Rename to ...
(pci_read_config_word): ... this and remove first argument.
(pcibios_read_config_dword): Rename to ...
(pci_read_config_dword): ... this and remove first argument.
(pcibios_write_config_dword): Rename to ...
(pci_write_config_dword): ... this and remove first argument.
2006-12-03 Guillem Jover <guillem@hadrons.org>
* 3dfx_device.c (VMA_OFFSET_ALIGNED): New macro.