diff options
author | Benoit Taine <benoit.taine@lip6.fr> | 2014-08-08 09:56:03 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-08-12 14:15:14 -0400 |
commit | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (patch) | |
tree | 2c6f874e1eb4dbb415ad96b6a39f1f7982655412 /drivers/video | |
parent | c8d6637d0497d62093dbba0694c7b3a80b79bfe1 (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/video')
-rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 2 | ||||
-rw-r--r-- | drivers/video/fbdev/i740fb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 569e7562fa3d..42543362f163 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c | |||
@@ -892,7 +892,7 @@ static int hvfb_remove(struct hv_device *hdev) | |||
892 | } | 892 | } |
893 | 893 | ||
894 | 894 | ||
895 | static DEFINE_PCI_DEVICE_TABLE(pci_stub_id_table) = { | 895 | static const struct pci_device_id pci_stub_id_table[] = { |
896 | { | 896 | { |
897 | .vendor = PCI_VENDOR_ID_MICROSOFT, | 897 | .vendor = PCI_VENDOR_ID_MICROSOFT, |
898 | .device = PCI_DEVICE_ID_HYPERV_VIDEO, | 898 | .device = PCI_DEVICE_ID_HYPERV_VIDEO, |
diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index ca7c9df193b0..a2b4204b42bb 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c | |||
@@ -1260,7 +1260,7 @@ fail: | |||
1260 | #define I740_ID_PCI 0x00d1 | 1260 | #define I740_ID_PCI 0x00d1 |
1261 | #define I740_ID_AGP 0x7800 | 1261 | #define I740_ID_AGP 0x7800 |
1262 | 1262 | ||
1263 | static DEFINE_PCI_DEVICE_TABLE(i740fb_id_table) = { | 1263 | static const struct pci_device_id i740fb_id_table[] = { |
1264 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_PCI) }, | 1264 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_PCI) }, |
1265 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_AGP) }, | 1265 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, I740_ID_AGP) }, |
1266 | { 0 } | 1266 | { 0 } |