diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/eeprom.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/eeprom.c | 46 | 
1 files changed, 24 insertions, 22 deletions
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 392771f9375..d9e605e3700 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c @@ -223,14 +223,14 @@ static int ath5k_eeprom_read_ants(struct ath5k_hw *ah, u32 *offset,  	ah->ah_ant_ctl[mode][AR5K_ANT_CTL] =  	    (ee->ee_ant_control[mode][0] << 4);  	ah->ah_ant_ctl[mode][AR5K_ANT_SWTABLE_A] = -	     ee->ee_ant_control[mode][1] 	| -	    (ee->ee_ant_control[mode][2] << 6) 	| +	     ee->ee_ant_control[mode][1]	| +	    (ee->ee_ant_control[mode][2] << 6)	|  	    (ee->ee_ant_control[mode][3] << 12) |  	    (ee->ee_ant_control[mode][4] << 18) |  	    (ee->ee_ant_control[mode][5] << 24);  	ah->ah_ant_ctl[mode][AR5K_ANT_SWTABLE_B] = -	     ee->ee_ant_control[mode][6] 	| -	    (ee->ee_ant_control[mode][7] << 6) 	| +	     ee->ee_ant_control[mode][6]	| +	    (ee->ee_ant_control[mode][7] << 6)	|  	    (ee->ee_ant_control[mode][8] << 12) |  	    (ee->ee_ant_control[mode][9] << 18) |  	    (ee->ee_ant_control[mode][10] << 24); @@ -255,7 +255,7 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,  	ee->ee_n_piers[mode] = 0;  	AR5K_EEPROM_READ(o++, val);  	ee->ee_adc_desired_size[mode]	= (s8)((val >> 8) & 0xff); -	switch(mode) { +	switch (mode) {  	case AR5K_EEPROM_MODE_11A:  		ee->ee_ob[mode][3]	= (val >> 5) & 0x7;  		ee->ee_db[mode][3]	= (val >> 2) & 0x7; @@ -349,7 +349,7 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,  	/* Note: >= v5 have bg freq piers on another location  	 * so these freq piers are ignored for >= v5 (should be 0xff  	 * anyway) */ -	switch(mode) { +	switch (mode) {  	case AR5K_EEPROM_MODE_11A:  		if (ah->ah_ee_version < AR5K_EEPROM_VERSION_4_1)  			break; @@ -422,7 +422,7 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,  	if (ee->ee_version < AR5K_EEPROM_VERSION_5_0)  		goto done; -	switch (mode){ +	switch (mode) {  	case AR5K_EEPROM_MODE_11A:  		ee->ee_switch_settling_turbo[mode] = (val >> 6) & 0x7f; @@ -436,7 +436,7 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,  		ee->ee_adc_desired_size_turbo[mode] |= (val & 0x1) << 7;  		ee->ee_pga_desired_size_turbo[mode] = (val >> 1) & 0xff; -		if (AR5K_EEPROM_EEMAP(ee->ee_misc0) >=2) +		if (AR5K_EEPROM_EEMAP(ee->ee_misc0) >= 2)  			ee->ee_pd_gain_overlap = (val >> 9) & 0xf;  		break;  	case AR5K_EEPROM_MODE_11G: @@ -516,7 +516,7 @@ ath5k_eeprom_read_freq_list(struct ath5k_hw *ah, int *offset, int max,  	u16 val;  	ee->ee_n_piers[mode] = 0; -	while(i < max) { +	while (i < max) {  		AR5K_EEPROM_READ(o++, val);  		freq1 = val & 0xff; @@ -602,7 +602,7 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset)  	struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;  	struct ath5k_chan_pcal_info *pcal; -	switch(mode) { +	switch (mode) {  	case AR5K_EEPROM_MODE_11B:  		pcal = ee->ee_pwr_cal_b;  		break; @@ -634,7 +634,7 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset)  /* Used to match PCDAC steps with power values on RF5111 chips   * (eeprom versions < 4). For RF5111 we have 11 pre-defined PCDAC   * steps that match with the power values we read from eeprom. On - * older eeprom versions (< 3.2) these steps are equaly spaced at + * older eeprom versions (< 3.2) these steps are equally spaced at   * 10% of the pcdac curve -until the curve reaches its maximum-   * (11 steps from 0 to 100%) but on newer eeprom versions (>= 3.2)   * these 11 steps are spaced in a different way. This function returns @@ -644,10 +644,12 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset)  static inline void  ath5k_get_pcdac_intercepts(struct ath5k_hw *ah, u8 min, u8 max, u8 *vp)  { -	static const u16 intercepts3[] = -		{ 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 }; -	static const u16 intercepts3_2[] = -		{ 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 }; +	static const u16 intercepts3[] = { +		0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 +	}; +	static const u16 intercepts3_2[] = { +		0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 +	};  	const u16 *ip;  	int i; @@ -762,7 +764,7 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode,  		/* Fill raw dataset  		 * (convert power to 0.25dB units -		 * for RF5112 combatibility) */ +		 * for RF5112 compatibility) */  		for (point = 0; point < pd->pd_points; point++) {  			/* Absolute values */ @@ -796,7 +798,7 @@ ath5k_eeprom_read_pcal_info_5111(struct ath5k_hw *ah, int mode)  	u16 val;  	offset = AR5K_EEPROM_GROUPS_START(ee->ee_version); -	switch(mode) { +	switch (mode) {  	case AR5K_EEPROM_MODE_11A:  		if (!AR5K_EEPROM_HDR_11A(ee->ee_header))  			return 0; @@ -882,7 +884,7 @@ ath5k_eeprom_read_pcal_info_5111(struct ath5k_hw *ah, int mode)   * Read power calibration for RF5112 chips   *   * For RF5112 we have 4 XPD -eXternal Power Detector- curves - * for each calibrated channel on 0, -6, -12 and -18dbm but we only + * for each calibrated channel on 0, -6, -12 and -18dBm but we only   * use the higher (3) and the lower (0) curves. Each curve has 0.5dB   * power steps on x axis and PCDAC steps on y axis and looks like a   * linear function. To recreate the curve and pass the power values @@ -1163,7 +1165,7 @@ ath5k_cal_data_offset_2413(struct ath5k_eeprom_info *ee, int mode)  {  	u32 offset = AR5K_EEPROM_CAL_DATA_START(ee->ee_misc4); -	switch(mode) { +	switch (mode) {  	case AR5K_EEPROM_MODE_11G:  		if (AR5K_EEPROM_HDR_11B(ee->ee_header))  			offset += ath5k_pdgains_size_2413(ee, @@ -1239,7 +1241,7 @@ ath5k_eeprom_convert_pcal_info_2413(struct ath5k_hw *ah, int mode,  			/* Fill raw dataset  			 * convert all pwr levels to -			 * quarter dB for RF5112 combatibility */ +			 * quarter dB for RF5112 compatibility */  			pd->pd_step[0] = pcinfo->pddac_i[pdg];  			pd->pd_pwr[0] = 4 * pcinfo->pwr_i[pdg]; @@ -1620,8 +1622,8 @@ ath5k_eeprom_read_ctl_info(struct ath5k_hw *ah)  		offset += AR5K_EEPROM_GROUPS_START(ee->ee_version);  	rep = ee->ee_ctl_pwr; -	for(i = 0; i < ee->ee_ctls; i++) { -		switch(ee->ee_ctl[i] & AR5K_CTL_MODE_M) { +	for (i = 0; i < ee->ee_ctls; i++) { +		switch (ee->ee_ctl[i] & AR5K_CTL_MODE_M) {  		case AR5K_CTL_11A:  		case AR5K_CTL_TURBO:  			ctl_mode = AR5K_EEPROM_MODE_11A;  |