aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorBenoit Taine <benoit.taine@lip6.fr>2014-08-08 09:56:03 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-08-12 14:15:14 -0400
commit9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (patch)
tree2c6f874e1eb4dbb415ad96b6a39f1f7982655412 /drivers/platform
parentc8d6637d0497d62093dbba0694c7b3a80b79bfe1 (diff)
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines. This issue was reported by checkpatch. A simplified version of the semantic patch that makes this change is as follows (http://coccinelle.lip6.fr/): // <smpl> @@ identifier i; declarer name DEFINE_PCI_DEVICE_TABLE; initializer z; @@ - DEFINE_PCI_DEVICE_TABLE(i) + const struct pci_device_id i[] = z; // </smpl> [bhelgaas: add semantic patch] Signed-off-by: Benoit Taine <benoit.taine@lip6.fr> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_ips.c2
-rw-r--r--drivers/platform/x86/intel_scu_ipc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 18dcb58ba965..a0d1f576cf40 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -1478,7 +1478,7 @@ ips_link_to_i915_driver(void)
1478} 1478}
1479EXPORT_SYMBOL_GPL(ips_link_to_i915_driver); 1479EXPORT_SYMBOL_GPL(ips_link_to_i915_driver);
1480 1480
1481static DEFINE_PCI_DEVICE_TABLE(ips_id_table) = { 1481static const struct pci_device_id ips_id_table[] = {
1482 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 1482 { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
1483 PCI_DEVICE_ID_INTEL_THERMAL_SENSOR), }, 1483 PCI_DEVICE_ID_INTEL_THERMAL_SENSOR), },
1484 { 0, } 1484 { 0, }
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 76ca094ed012..66a4d3284aab 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -640,7 +640,7 @@ static void ipc_remove(struct pci_dev *pdev)
640 intel_scu_devices_destroy(); 640 intel_scu_devices_destroy();
641} 641}
642 642
643static DEFINE_PCI_DEVICE_TABLE(pci_ids) = { 643static const struct pci_device_id pci_ids[] = {
644 { 644 {
645 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT), 645 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT),
646 (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata, 646 (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,