leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: describe hw initialization better

Browse Source 
During initialization ath9k tends to use "attach" to when we
initialize hardware due to the fact we used to attach a "HAL".
The notion of a HAL is long gone, so lets just be clear on what
we are doing.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2009-08-03 12:24:46 -07:00 committed by John W. Linville
parent aa4058aea2
commit f637cfd6bb
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ani.c
View File

@ -777,7 +777,7 @@ void ath9k_hw_ani_setup(struct ath_hw *ah)
}
}
void ath9k_hw_ani_attach(struct ath_hw *ah)
void ath9k_hw_ani_init(struct ath_hw *ah)
{
int i;

2
drivers/net/wireless/ath/ath9k/ani.h
View File

@ -132,7 +132,7 @@ u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah, u32 *rxc_pcnt,
void ath9k_hw_procmibevent(struct ath_hw *ah,
const struct ath9k_node_stats *stats);
void ath9k_hw_ani_setup(struct ath_hw *ah);
void ath9k_hw_ani_attach(struct ath_hw *ah);
void ath9k_hw_ani_init(struct ath_hw *ah);
void ath9k_hw_ani_detach(struct ath_hw *ah);
#endif /* ANI_H */

2
drivers/net/wireless/ath/ath9k/eeprom.c
View File

@ -3978,7 +3978,7 @@ static struct eeprom_ops eep_AR9287_ops = {
};
int ath9k_hw_eeprom_attach(struct ath_hw *ah)
int ath9k_hw_eeprom_init(struct ath_hw *ah)
{
int status;
if (AR_SREV_9287(ah)) {

2
drivers/net/wireless/ath/ath9k/eeprom.h
View File

@ -665,6 +665,6 @@ struct eeprom_ops {
(((_txchainmask >> 2) & 1) + \
((_txchainmask >> 1) & 1) + (_txchainmask & 1))
int ath9k_hw_eeprom_attach(struct ath_hw *ah);
int ath9k_hw_eeprom_init(struct ath_hw *ah);
#endif /* EEPROM_H */

12
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -578,7 +578,7 @@ static void ath9k_hw_init_txgain_ini(struct ath_hw *ah)
}
}
static int ath9k_hw_post_attach(struct ath_hw *ah)
static int ath9k_hw_post_init(struct ath_hw *ah)
{
int ecode;
@ -589,7 +589,7 @@ static int ath9k_hw_post_attach(struct ath_hw *ah)
if (ecode != 0)
return ecode;
ecode = ath9k_hw_eeprom_attach(ah);
ecode = ath9k_hw_eeprom_init(ah);
if (ecode != 0)
return ecode;
@ -602,7 +602,7 @@ static int ath9k_hw_post_attach(struct ath_hw *ah)
if (!AR_SREV_9100(ah)) {
ath9k_hw_ani_setup(ah);
ath9k_hw_ani_attach(ah);
ath9k_hw_ani_init(ah);
}
return 0;
@ -896,7 +896,7 @@ static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah)
}
}
int ath9k_hw_attach(struct ath_hw *ah)
int ath9k_hw_init(struct ath_hw *ah)
{
int r;
@ -963,7 +963,7 @@ int ath9k_hw_attach(struct ath_hw *ah)
else
ath9k_hw_disablepcie(ah);
r = ath9k_hw_post_attach(ah);
r = ath9k_hw_post_init(ah);
if (r)
goto bad;
@ -2930,7 +2930,7 @@ void ath9k_hw_configpcipowersave(struct ath_hw *ah, int restore)
/*
* AR9280 2.0 or later chips use SerDes values from the
* initvals.h initialized depending on chipset during
* ath9k_hw_attach()
* ath9k_hw_init()
*/
for (i = 0; i < ah->iniPcieSerdes.ia_rows; i++) {
REG_WRITE(ah, INI_RA(&ah->iniPcieSerdes, i, 0),

4
drivers/net/wireless/ath/ath9k/hw.h
View File

@ -541,10 +541,10 @@ struct ath_hw {
struct ar5416IniArray iniModesTxGain;
};
/* Attach, Detach, Reset */
/* Initialization, Detach, Reset */
const char *ath9k_hw_probe(u16 vendorid, u16 devid);
void ath9k_hw_detach(struct ath_hw *ah);
int ath9k_hw_attach(struct ath_hw *ah);
int ath9k_hw_init(struct ath_hw *ah);
void ath9k_hw_rfdetach(struct ath_hw *ah);
int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
bool bChannelChange);

4
drivers/net/wireless/ath/ath9k/main.c
View File

@ -1332,10 +1332,10 @@ static int ath_init(u16 devid, struct ath_softc *sc)
ah->hw_version.devid = devid;
sc->sc_ah = ah;
r = ath9k_hw_attach(ah);
r = ath9k_hw_init(ah);
if (r) {
DPRINTF(sc, ATH_DBG_FATAL,
"Unable to attach hardware; "
"Unable to initialize hardware; "
"initialization status: %d\n", r);
goto bad;
}