Skip to contentSkip to conversation

patch staging-slicoss-use-pci_device_table.patch added to gregkh-2.6 tree

PATCH [email protected] 1 participant 1 message Dec 18, 2009 1 message not in the archive Staging

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20091218075904.GA4524@coldcone

[email protected]

author Applied
#1 lore raw

This is a note to let you know that I've just added the patch titled

Subject: staging: slicoss Use PCI_DEVICE_TABLE.

to my gregkh-2.6 tree. Its filename is

staging-slicoss-use-pci_device_table.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Fri Dec 18 10:34:05 2009

From: "Denis Kirjanov <[email protected]" <[email protected]>
Date: Fri, 18 Dec 2009 10:59:04 +0300
Subject: staging: slicoss Use PCI_DEVICE_TABLE.
To: [email protected], [email protected], [email protected]
Cc: [email protected]
Message-ID: <20091218075904.GA4524@coldcone>
Content-Disposition: inline

Use PCI_DEVICE_TABLE: defines array as const and puts it into the __devinitconst section.

---
 drivers/staging/slicoss/slicoss.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/slicoss/slicoss.c +4 -8
@@ -194,14 +194,10 @@ MODULE_PARM_DESC(dynamic_intagg, "Dynami
 module_param(intagg_delay, int, 0);
 MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay");
 
-static struct pci_device_id slic_pci_tbl[] __devinitdata = {
-	{PCI_VENDOR_ID_ALACRITECH,
-	 SLIC_1GB_DEVICE_ID,
-	 PCI_ANY_ID, PCI_ANY_ID,},
-	{PCI_VENDOR_ID_ALACRITECH,
-	 SLIC_2GB_DEVICE_ID,
-	 PCI_ANY_ID, PCI_ANY_ID,},
-	{0,}
+static DEFINE_PCI_DEVICE_TABLE(slic_pci_tbl) = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_1GB_DEVICE_ID) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_2GB_DEVICE_ID) },
+	{ 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, slic_pci_tbl);