aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k
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/net/wireless/ath/ath5k
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/net/wireless/ath/ath5k')
-rw-r--r--drivers/net/wireless/ath/ath5k/led.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/pci.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index f77ef36acf87..48a6a69b57bc 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -53,7 +53,7 @@
53#define ATH_POLARITY(data) ((data) & 0xff) 53#define ATH_POLARITY(data) ((data) & 0xff)
54 54
55/* Devices we match on for LED config info (typically laptops) */ 55/* Devices we match on for LED config info (typically laptops) */
56static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = { 56static const struct pci_device_id ath5k_led_devices[] = {
57 /* AR5211 */ 57 /* AR5211 */
58 { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211), ATH_LED(0, 0) }, 58 { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211), ATH_LED(0, 0) },
59 /* HP Compaq nc6xx, nc4000, nx6000 */ 59 /* HP Compaq nc6xx, nc4000, nx6000 */
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index 859db7c34f87..c6156cc38940 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -28,7 +28,7 @@
28#include "reg.h" 28#include "reg.h"
29 29
30/* Known PCI ids */ 30/* Known PCI ids */
31static DEFINE_PCI_DEVICE_TABLE(ath5k_pci_id_table) = { 31static const struct pci_device_id ath5k_pci_id_table[] = {
32 { PCI_VDEVICE(ATHEROS, 0x0207) }, /* 5210 early */ 32 { PCI_VDEVICE(ATHEROS, 0x0207) }, /* 5210 early */
33 { PCI_VDEVICE(ATHEROS, 0x0007) }, /* 5210 */ 33 { PCI_VDEVICE(ATHEROS, 0x0007) }, /* 5210 */
34 { PCI_VDEVICE(ATHEROS, 0x0011) }, /* 5311 - this is on AHB bus !*/ 34 { PCI_VDEVICE(ATHEROS, 0x0011) }, /* 5311 - this is on AHB bus !*/