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/oxygen | |
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/oxygen')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 | ||||
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index ada6c256378e..74afb6b75976 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -97,7 +97,7 @@ enum { | |||
97 | MODEL_XONAR_DGX, | 97 | MODEL_XONAR_DGX, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = { | 100 | static const struct pci_device_id oxygen_ids[] = { |
101 | /* C-Media's reference design */ | 101 | /* C-Media's reference design */ |
102 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, | 102 | { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF }, |
103 | { OXYGEN_PCI_SUBID(0x10b0, 0x0217), .driver_data = MODEL_CMEDIA_REF }, | 103 | { OXYGEN_PCI_SUBID(0x10b0, 0x0217), .driver_data = MODEL_CMEDIA_REF }, |
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index dbbbacfd535e..7b317a28a19c 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(id, "ID string"); | |||
41 | module_param_array(enable, bool, NULL, 0444); | 41 | module_param_array(enable, bool, NULL, 0444); |
42 | MODULE_PARM_DESC(enable, "enable card"); | 42 | MODULE_PARM_DESC(enable, "enable card"); |
43 | 43 | ||
44 | static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { | 44 | static const struct pci_device_id xonar_ids[] = { |
45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, | 45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, |
46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, | 46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, |
47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, | 47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, |