diff options
| author | Sujith Manoharan <Sujith.Manoharan@atheros.com> | 2010-12-07 16:31:38 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 17:08:06 -0500 |
| commit | 0b5ead91cda63e0db964dadc77601233434f60cb (patch) | |
| tree | 989e877003120c769f8d155dee129033f96029f2 /drivers/net/wireless/ath/ath9k/eeprom_9287.c | |
| parent | c658e5db01117bf2a321a9a782754dd5b10e2f15 (diff) | |
| download | kernel_samsung_smdk4412-0b5ead91cda63e0db964dadc77601233434f60cb.zip kernel_samsung_smdk4412-0b5ead91cda63e0db964dadc77601233434f60cb.tar.gz kernel_samsung_smdk4412-0b5ead91cda63e0db964dadc77601233434f60cb.tar.bz2 | |
ath9k_htc: Cleanup device identification
ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc.
Adding driver specific data to the shared structure would impact all the
drivers. Handling USB device recognition for devices specific to ath9k_htc
can be handled within the driver itself.
Also, AR7010 refers to the processor used in both AR9280/AR9287 based
devices. Rename the device enumerations accordingly.
While at it, check properly for the bus type when choosing the EEPROM
base address for UB95.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom_9287.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index 9ec4bc8..065402f 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c @@ -37,10 +37,10 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah) int addr, eep_start_loc; eep_data = (u16 *)eep; - if (!common->driver_info) - eep_start_loc = AR9287_EEP_START_LOC; - else + if (common->bus_ops->ath_bus_type == ATH_USB) eep_start_loc = AR9287_HTC_EEP_START_LOC; + else + eep_start_loc = AR9287_EEP_START_LOC; if (!ath9k_hw_use_flash(ah)) { ath_dbg(common, ATH_DBG_EEPROM, |