diff options
author | Pavel Roskin <proski@gnu.org> | 2009-08-26 22:30:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:55 -0400 |
commit | 97a81f5c5033cb02ae56dd80ff9c38866c777bd8 (patch) | |
tree | fc88f10b4bc2a167baeb9d1c38022b9612de296e /drivers/net/wireless/ath/ath5k/base.c | |
parent | 3b3ee43da43aca1cbf4c3651379b2b1492e49dd6 (diff) |
ath5k: don't use PCI ID to find the chip revision
AR5K_SREV is available even if the chip has been put to sleep. Relying
on the chip register allows binding non-standard PCI IDs by
echo VENDOR_ID PRODUCT_ID >/sys/bus/pci/drivers/ath5k/new_id
without having to specify the driver data as well.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 94d46fd94ff6..9c6ab5378f6e 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -84,24 +84,24 @@ MODULE_VERSION("0.6.0 (EXPERIMENTAL)"); | |||
84 | 84 | ||
85 | /* Known PCI ids */ | 85 | /* Known PCI ids */ |
86 | static const struct pci_device_id ath5k_pci_id_table[] = { | 86 | static const struct pci_device_id ath5k_pci_id_table[] = { |
87 | { PCI_VDEVICE(ATHEROS, 0x0207), .driver_data = AR5K_AR5210 }, /* 5210 early */ | 87 | { PCI_VDEVICE(ATHEROS, 0x0207) }, /* 5210 early */ |
88 | { PCI_VDEVICE(ATHEROS, 0x0007), .driver_data = AR5K_AR5210 }, /* 5210 */ | 88 | { PCI_VDEVICE(ATHEROS, 0x0007) }, /* 5210 */ |
89 | { PCI_VDEVICE(ATHEROS, 0x0011), .driver_data = AR5K_AR5211 }, /* 5311 - this is on AHB bus !*/ | 89 | { PCI_VDEVICE(ATHEROS, 0x0011) }, /* 5311 - this is on AHB bus !*/ |
90 | { PCI_VDEVICE(ATHEROS, 0x0012), .driver_data = AR5K_AR5211 }, /* 5211 */ | 90 | { PCI_VDEVICE(ATHEROS, 0x0012) }, /* 5211 */ |
91 | { PCI_VDEVICE(ATHEROS, 0x0013), .driver_data = AR5K_AR5212 }, /* 5212 */ | 91 | { PCI_VDEVICE(ATHEROS, 0x0013) }, /* 5212 */ |
92 | { PCI_VDEVICE(3COM_2, 0x0013), .driver_data = AR5K_AR5212 }, /* 3com 5212 */ | 92 | { PCI_VDEVICE(3COM_2, 0x0013) }, /* 3com 5212 */ |
93 | { PCI_VDEVICE(3COM, 0x0013), .driver_data = AR5K_AR5212 }, /* 3com 3CRDAG675 5212 */ | 93 | { PCI_VDEVICE(3COM, 0x0013) }, /* 3com 3CRDAG675 5212 */ |
94 | { PCI_VDEVICE(ATHEROS, 0x1014), .driver_data = AR5K_AR5212 }, /* IBM minipci 5212 */ | 94 | { PCI_VDEVICE(ATHEROS, 0x1014) }, /* IBM minipci 5212 */ |
95 | { PCI_VDEVICE(ATHEROS, 0x0014), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 95 | { PCI_VDEVICE(ATHEROS, 0x0014) }, /* 5212 combatible */ |
96 | { PCI_VDEVICE(ATHEROS, 0x0015), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 96 | { PCI_VDEVICE(ATHEROS, 0x0015) }, /* 5212 combatible */ |
97 | { PCI_VDEVICE(ATHEROS, 0x0016), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 97 | { PCI_VDEVICE(ATHEROS, 0x0016) }, /* 5212 combatible */ |
98 | { PCI_VDEVICE(ATHEROS, 0x0017), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 98 | { PCI_VDEVICE(ATHEROS, 0x0017) }, /* 5212 combatible */ |
99 | { PCI_VDEVICE(ATHEROS, 0x0018), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 99 | { PCI_VDEVICE(ATHEROS, 0x0018) }, /* 5212 combatible */ |
100 | { PCI_VDEVICE(ATHEROS, 0x0019), .driver_data = AR5K_AR5212 }, /* 5212 combatible */ | 100 | { PCI_VDEVICE(ATHEROS, 0x0019) }, /* 5212 combatible */ |
101 | { PCI_VDEVICE(ATHEROS, 0x001a), .driver_data = AR5K_AR5212 }, /* 2413 Griffin-lite */ | 101 | { PCI_VDEVICE(ATHEROS, 0x001a) }, /* 2413 Griffin-lite */ |
102 | { PCI_VDEVICE(ATHEROS, 0x001b), .driver_data = AR5K_AR5212 }, /* 5413 Eagle */ | 102 | { PCI_VDEVICE(ATHEROS, 0x001b) }, /* 5413 Eagle */ |
103 | { PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* PCI-E cards */ | 103 | { PCI_VDEVICE(ATHEROS, 0x001c) }, /* PCI-E cards */ |
104 | { PCI_VDEVICE(ATHEROS, 0x001d), .driver_data = AR5K_AR5212 }, /* 2417 Nala */ | 104 | { PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */ |
105 | { 0 } | 105 | { 0 } |
106 | }; | 106 | }; |
107 | MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table); | 107 | MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table); |
@@ -566,7 +566,7 @@ ath5k_pci_probe(struct pci_dev *pdev, | |||
566 | } | 566 | } |
567 | 567 | ||
568 | /* Initialize device */ | 568 | /* Initialize device */ |
569 | sc->ah = ath5k_hw_attach(sc, id->driver_data); | 569 | sc->ah = ath5k_hw_attach(sc); |
570 | if (IS_ERR(sc->ah)) { | 570 | if (IS_ERR(sc->ah)) { |
571 | ret = PTR_ERR(sc->ah); | 571 | ret = PTR_ERR(sc->ah); |
572 | goto err_irq; | 572 | goto err_irq; |