Skip to contentSkip to conversation

mfd: Convert to DEFINE_PCI_DEVICE_TABLE

PATCH In review Axel Lin 3 participants 3 messages Dec 1, 2011 – Dec 19, 2011 Multifunction devices (MFD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mfd: Convert to DEFINE_PCI_DEVICE_TABLE

Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables.

Cc Andres Salomon <[email protected]>
Cc Denis Turischev <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Vincent Sanders <[email protected]>
Cc Mocean Laboratories <[email protected]>
Cc Harald Welte <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
 drivers/mfd/cs5535-mfd.c |    2 +-
 drivers/mfd/lpc_sch.c    |    2 +-
 drivers/mfd/sm501.c      |    2 +-
 drivers/mfd/timberdale.c |    2 +-
 drivers/mfd/vx855.c      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/cs5535-mfd.c +1 -1
index 155fa04..3d968a7 100644
@@ -172,7 +172,7 @@ static void __devexit cs5535_mfd_remove(struct pci_dev *pdev)
 	pci_disable_device(pdev);
 }
 
-static struct pci_device_id cs5535_mfd_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
 	{ 0, }
drivers/mfd/lpc_sch.c +1 -1
index ea1169b..abc4213 100644
@@ -74,7 +74,7 @@ static struct mfd_cell tunnelcreek_cells[] = {
 	},
 };
 
-static struct pci_device_id lpc_sch_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
 	{ 0, }
drivers/mfd/sm501.c +1 -1
index df3702c..f4d8611 100644
@@ -1720,7 +1720,7 @@ static int sm501_plat_remove(struct platform_device *dev)
 	return 0;
 }
 
-static struct pci_device_id sm501_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = {
 	{ 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	{ 0, },
 };
drivers/mfd/timberdale.c +1 -1
index 02d6569..0ba26fb 100644
@@ -857,7 +857,7 @@ static void __devexit timb_remove(struct pci_dev *dev)
 	kfree(priv);
 }
 
-static struct pci_device_id timberdale_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },
 	{ 0 }
 };
drivers/mfd/vx855.c +1 -1
index d698703..b73cc15 100644
@@ -118,7 +118,7 @@ static void __devexit vx855_remove(struct pci_dev *pdev)
 	pci_disable_device(pdev);
 }
 
-static struct pci_device_id vx855_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
 	{ 0, }
 };
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw

Hi Axel,

thanks for your patch. This is trivial, but I'm still sending an Ack:

Quoted 10 lines · Axel Lin

Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables.

Cc Andres Salomon <[email protected]>
Cc Denis Turischev <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Vincent Sanders <[email protected]>
Cc Mocean Laboratories <[email protected]>
Cc Harald Welte <[email protected]>
Signed-off-by Axel Lin <[email protected]>
Acked-by Harald Welte <[email protected]>
Signature · 4 lines
- Harald Welte <[email protected]>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)
#2 lore raw
In reply to Axel Lin

Hi Axel,

Quoted 2 lines · Axel Lin

Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables.

Looks good, I applied it.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/