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 /sound/pci/rme9652 | |
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 'sound/pci/rme9652')
-rw-r--r-- | sound/pci/rme9652/hdsp.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/hdspm.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/rme9652.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 4c6f5d1c9882..7646ba1664eb 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -597,7 +597,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d | |||
597 | } | 597 | } |
598 | 598 | ||
599 | 599 | ||
600 | static DEFINE_PCI_DEVICE_TABLE(snd_hdsp_ids) = { | 600 | static const struct pci_device_id snd_hdsp_ids[] = { |
601 | { | 601 | { |
602 | .vendor = PCI_VENDOR_ID_XILINX, | 602 | .vendor = PCI_VENDOR_ID_XILINX, |
603 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, | 603 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP, |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index cb82b593473a..52d86af3ef2d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -1077,7 +1077,7 @@ struct hdspm { | |||
1077 | }; | 1077 | }; |
1078 | 1078 | ||
1079 | 1079 | ||
1080 | static DEFINE_PCI_DEVICE_TABLE(snd_hdspm_ids) = { | 1080 | static const struct pci_device_id snd_hdspm_ids[] = { |
1081 | { | 1081 | { |
1082 | .vendor = PCI_VENDOR_ID_XILINX, | 1082 | .vendor = PCI_VENDOR_ID_XILINX, |
1083 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI, | 1083 | .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI, |
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 1d9be90f7748..fa9a2a8dce5a 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
@@ -307,7 +307,7 @@ static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_d | |||
307 | } | 307 | } |
308 | 308 | ||
309 | 309 | ||
310 | static DEFINE_PCI_DEVICE_TABLE(snd_rme9652_ids) = { | 310 | static const struct pci_device_id snd_rme9652_ids[] = { |
311 | { | 311 | { |
312 | .vendor = 0x10ee, | 312 | .vendor = 0x10ee, |
313 | .device = 0x3fc4, | 313 | .device = 0x3fc4, |