Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] pcnet32: Use PCI_DEVICE macro
Jon Mason wrote on Thu, 12 Jan 2006 17:07:49 -0600:
This patch adds the PCI_DEVICE macro to the pcnet32 driver.
This has been tested on my opteron with my "trident" adapter.
Don Fry modified it slightly and tested on ia32 and ppc64.
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Don Fry <brazilnut@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
authored by Don Fry and committed by Jeff Garzik f2622a2b dcaf9769
+4
-7
drivers/net/pcnet32.c
+4
-7
drivers/net/pcnet32.c
···
58
58
* PCI device identifiers for "new style" Linux PCI Device Drivers
59
59
*/
60
60
static struct pci_device_id pcnet32_pci_tbl[] = {
61
-
{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME,
62
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
63
-
{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,
64
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
61
+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
62
+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
65
63
66
64
/*
67
65
* Adapters that were sold with IBM's RS/6000 or pSeries hardware have
68
66
* the incorrect vendor id.
69
67
*/
70
-
{ PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE,
71
-
PCI_ANY_ID, PCI_ANY_ID,
72
-
PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, 0},
68
+
{ PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE),
69
+
.class = (PCI_CLASS_NETWORK_ETHERNET << 8), .class_mask = 0xffff00, },
73
70
74
71
{ } /* terminate list */
75
72
};