aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-14 19:11:25 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-03-09 17:33:15 -0500
commite290cf276bc2a6cdcb360fd72b7a6a24539505fc (patch)
tree3bf1e2faedfe7336530c10251d2abe85a3cb949a /drivers
parentb42dfed83d95a3c9e9cbd708f1993a7474abb79a (diff)
spi: Convert to DEFINE_PCI_DEVICE_TABLE
Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE tables. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-dw-pci.c2
-rw-r--r--drivers/spi/spi-pxa2xx-pci.c2
-rw-r--r--drivers/spi/spi-topcliff-pch.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index f64250ea1611..14f7cc9523f0 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
149#define spi_resume NULL 149#define spi_resume NULL
150#endif 150#endif
151 151
152static const struct pci_device_id pci_ids[] __devinitdata = { 152static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
153 /* Intel MID platform SPI controller 0 */ 153 /* Intel MID platform SPI controller 0 */
154 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) }, 154 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
155 {}, 155 {},
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 8caa07d58e69..3fb44afe27b4 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -151,7 +151,7 @@ static void __devexit ce4100_spi_remove(struct pci_dev *dev)
151 kfree(spi_info); 151 kfree(spi_info);
152} 152}
153 153
154static struct pci_device_id ce4100_spi_devices[] __devinitdata = { 154static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = {
155 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) }, 155 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) },
156 { }, 156 { },
157}; 157};
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 88e6b3fd1f12..4a5fafb8d574 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -216,7 +216,7 @@ struct pch_pd_dev_save {
216 struct pch_spi_board_data *board_dat; 216 struct pch_spi_board_data *board_dat;
217}; 217};
218 218
219static struct pci_device_id pch_spi_pcidev_id[] = { 219static DEFINE_PCI_DEVICE_TABLE(pch_spi_pcidev_id) = {
220 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, }, 220 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, },
221 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, }, 221 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
222 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, }, 222 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },