diff options
| author |   Mark Einon <mark.einon@gmail.com> | 2011-10-20 01:18:45 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 10:07:12 +0200 |
| commit | 26d19bf60be3a41bbd6c31d89d13a9c5e8edef8b (patch) | |
| tree | 7b7764099f323e6471a4901f43d3ccbb5fd9410f /drivers/staging/et131x | |
| parent | staging: et131x: Match dma_alloc_ calls with dma_free_ calls (diff) | |
| download | linux-dev-26d19bf60be3a41bbd6c31d89d13a9c5e8edef8b.tar.xz linux-dev-26d19bf60be3a41bbd6c31d89d13a9c5e8edef8b.zip | |
staging: et131x: Tidy up PCI device table definition
Used the convenience macros DEFINE_PCI_DEVICE_TABLE and PCI_VDEVICE to
tidy up the device table definition.
Also remove the corresponding TODO item from the README.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/README | 1 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index 87b936012656..0928eb55fee1 100644 --- a/drivers/staging/et131x/README +++ b/drivers/staging/et131x/README @@ -10,7 +10,6 @@ driver as they did not build properly at the time. TODO: - Use of kmem_cache seems a bit unusual - It's too late stopping the tx queue when there is no room for the current packet. The condition should be detected for the next packet. - - PCI_VDEVICE ? Please send patches to: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 28d54b31e437..cc41111b7b70 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -169,8 +169,7 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver " #define ET1310_PCI_REPLAY 0xC2 #define ET1310_PCI_L0L1LATENCY 0xCF -/* PCI Vendor/Product IDs */ -#define ET131X_PCI_VENDOR_ID 0x11C1 /* Agere Systems */ +/* PCI Product IDs */ #define ET131X_PCI_DEVICE_ID_GIG 0xED00 /* ET1310 1000 Base-T 8 */ #define ET131X_PCI_DEVICE_ID_FAST 0xED01 /* ET1310 100 Base-T */ @@ -4647,14 +4646,11 @@ static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume); #define ET131X_PM_OPS NULL #endif -static struct pci_device_id et131x_pci_table[] __devinitdata = { - {ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_GIG, PCI_ANY_ID, - PCI_ANY_ID, 0, 0, 0UL}, - {ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_FAST, PCI_ANY_ID, - PCI_ANY_ID, 0, 0, 0UL}, +static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = { + { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL}, + { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL}, {0,} }; - MODULE_DEVICE_TABLE(pci, et131x_pci_table); static struct pci_driver et131x_driver = { |