aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-12-02 18:08:45 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-12-03 07:16:09 -0500
commit14f4a8838acac0fe6bf710ec08fc4cce57c0011b (patch)
tree0aa70c2b0b9856a101ef623af771b0b2cfd35944
parent0299b77b44531ae0963fe86d8b9cb9b5ddb584b7 (diff)
gpio: remove DEFINE_PCI_DEVICE_TABLE macro
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-amd8111.c2
-rw-r--r--drivers/gpio/gpio-bt8xx.c2
-rw-r--r--drivers/gpio/gpio-intel-mid.c2
-rw-r--r--drivers/gpio/gpio-ml-ioh.c2
-rw-r--r--drivers/gpio/gpio-pch.c2
-rw-r--r--drivers/gpio/gpio-sodaville.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c
index 710fafcdd1b1..94e9992f8904 100644
--- a/drivers/gpio/gpio-amd8111.c
+++ b/drivers/gpio/gpio-amd8111.c
@@ -60,7 +60,7 @@
60 * register a pci_driver, because someone else might one day 60 * register a pci_driver, because someone else might one day
61 * want to register another driver on the same PCI id. 61 * want to register another driver on the same PCI id.
62 */ 62 */
63static DEFINE_PCI_DEVICE_TABLE(pci_tbl) = { 63static const struct pci_device_id pci_tbl[] = {
64 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS), 0 }, 64 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS), 0 },
65 { 0, }, /* terminate list */ 65 { 0, }, /* terminate list */
66}; 66};
diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index 9dfe36fd8baf..c5c356b7f2ce 100644
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -308,7 +308,7 @@ static int bt8xxgpio_resume(struct pci_dev *pdev)
308#define bt8xxgpio_resume NULL 308#define bt8xxgpio_resume NULL
309#endif /* CONFIG_PM */ 309#endif /* CONFIG_PM */
310 310
311static DEFINE_PCI_DEVICE_TABLE(bt8xxgpio_pci_tbl) = { 311static const struct pci_device_id bt8xxgpio_pci_tbl[] = {
312 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848) }, 312 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848) },
313 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849) }, 313 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849) },
314 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878) }, 314 { PCI_DEVICE(PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878) },
diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index 17f135046c7f..f2035c01577f 100644
--- a/drivers/gpio/gpio-intel-mid.c
+++ b/drivers/gpio/gpio-intel-mid.c
@@ -275,7 +275,7 @@ static const struct intel_mid_gpio_ddata gpio_tangier = {
275 .chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE, 275 .chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
276}; 276};
277 277
278static DEFINE_PCI_DEVICE_TABLE(intel_gpio_ids) = { 278static const struct pci_device_id intel_gpio_ids[] = {
279 { 279 {
280 /* Lincroft */ 280 /* Lincroft */
281 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f), 281 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f),
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 6da6d7667c6d..5c94af3c84e0 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -596,7 +596,7 @@ static int ioh_gpio_resume(struct pci_dev *pdev)
596#define ioh_gpio_resume NULL 596#define ioh_gpio_resume NULL
597#endif 597#endif
598 598
599static DEFINE_PCI_DEVICE_TABLE(ioh_gpio_pcidev_id) = { 599static const struct pci_device_id ioh_gpio_pcidev_id[] = {
600 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x802E) }, 600 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x802E) },
601 { 0, } 601 { 0, }
602}; 602};
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 0fec097e838d..ef7a756c9ded 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -518,7 +518,7 @@ static int pch_gpio_resume(struct pci_dev *pdev)
518#endif 518#endif
519 519
520#define PCI_VENDOR_ID_ROHM 0x10DB 520#define PCI_VENDOR_ID_ROHM 0x10DB
521static DEFINE_PCI_DEVICE_TABLE(pch_gpio_pcidev_id) = { 521static const struct pci_device_id pch_gpio_pcidev_id[] = {
522 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) }, 522 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803) },
523 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) }, 523 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014) },
524 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) }, 524 { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043) },
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index 88f374ac7753..5d171e0182db 100644
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -270,7 +270,7 @@ static void sdv_gpio_remove(struct pci_dev *pdev)
270 kfree(sd); 270 kfree(sd);
271} 271}
272 272
273static DEFINE_PCI_DEVICE_TABLE(sdv_gpio_pci_ids) = { 273static const struct pci_device_id sdv_gpio_pci_ids[] = {
274 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_SDV_GPIO) }, 274 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_SDV_GPIO) },
275 { 0, }, 275 { 0, },
276}; 276};