diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-11-30 20:41:03 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-01-08 18:37:37 -0500 |
commit | 61485c63c4a4e823445da4ae8798d9082f6bc586 (patch) | |
tree | aca6825fda082914a0da00642a96c42c6e9a32fc /drivers/mfd | |
parent | 73fe6b2bc9dac9906bbe59475a681194db780370 (diff) |
mfd: Convert to DEFINE_PCI_DEVICE_TABLE
Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE
tables.
Cc: Andres Salomon <dilinger@queued.net>
Cc: Denis Turischev <denis@compulab.co.il>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Vincent Sanders <vince@simtec.co.uk>
Cc: Mocean Laboratories <info@mocean-labs.com>
Cc: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/cs5535-mfd.c | 2 | ||||
-rw-r--r-- | drivers/mfd/lpc_sch.c | 2 | ||||
-rw-r--r-- | drivers/mfd/sm501.c | 2 | ||||
-rw-r--r-- | drivers/mfd/timberdale.c | 2 | ||||
-rw-r--r-- | drivers/mfd/vx855.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c index e488a78a2fd6..315fef5d466a 100644 --- a/drivers/mfd/cs5535-mfd.c +++ b/drivers/mfd/cs5535-mfd.c | |||
@@ -172,7 +172,7 @@ static void __devexit cs5535_mfd_remove(struct pci_dev *pdev) | |||
172 | pci_disable_device(pdev); | 172 | pci_disable_device(pdev); |
173 | } | 173 | } |
174 | 174 | ||
175 | static struct pci_device_id cs5535_mfd_pci_tbl[] = { | 175 | static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = { |
176 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) }, | 176 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) }, |
177 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) }, | 177 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) }, |
178 | { 0, } | 178 | { 0, } |
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c index ea1169b04779..abc421364a45 100644 --- a/drivers/mfd/lpc_sch.c +++ b/drivers/mfd/lpc_sch.c | |||
@@ -74,7 +74,7 @@ static struct mfd_cell tunnelcreek_cells[] = { | |||
74 | }, | 74 | }, |
75 | }; | 75 | }; |
76 | 76 | ||
77 | static struct pci_device_id lpc_sch_ids[] = { | 77 | static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = { |
78 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) }, | 78 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) }, |
79 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) }, | 79 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) }, |
80 | { 0, } | 80 | { 0, } |
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index df3702c1756d..f4d86117f44a 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -1720,7 +1720,7 @@ static int sm501_plat_remove(struct platform_device *dev) | |||
1720 | return 0; | 1720 | return 0; |
1721 | } | 1721 | } |
1722 | 1722 | ||
1723 | static struct pci_device_id sm501_pci_tbl[] = { | 1723 | static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = { |
1724 | { 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, | 1724 | { 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, |
1725 | { 0, }, | 1725 | { 0, }, |
1726 | }; | 1726 | }; |
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 02d65692ceb4..0ba26fb12cf5 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c | |||
@@ -857,7 +857,7 @@ static void __devexit timb_remove(struct pci_dev *dev) | |||
857 | kfree(priv); | 857 | kfree(priv); |
858 | } | 858 | } |
859 | 859 | ||
860 | static struct pci_device_id timberdale_pci_tbl[] = { | 860 | static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = { |
861 | { PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) }, | 861 | { PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) }, |
862 | { 0 } | 862 | { 0 } |
863 | }; | 863 | }; |
diff --git a/drivers/mfd/vx855.c b/drivers/mfd/vx855.c index d698703dbd46..b73cc15e0081 100644 --- a/drivers/mfd/vx855.c +++ b/drivers/mfd/vx855.c | |||
@@ -118,7 +118,7 @@ static void __devexit vx855_remove(struct pci_dev *pdev) | |||
118 | pci_disable_device(pdev); | 118 | pci_disable_device(pdev); |
119 | } | 119 | } |
120 | 120 | ||
121 | static struct pci_device_id vx855_pci_tbl[] = { | 121 | static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = { |
122 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, | 122 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, |
123 | { 0, } | 123 | { 0, } |
124 | }; | 124 | }; |