Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d19bf6 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

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: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 675c8f68

drivers/staging/et131x/README

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/et131x/et131x.c

+4 −8
Original line number Diff line number Diff line
@@ -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 = {