diff options
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/phy.c')
-rw-r--r-- | drivers/net/wireless/ath/carl9170/phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c index da1ab962ee48..aa147a9120b6 100644 --- a/drivers/net/wireless/ath/carl9170/phy.c +++ b/drivers/net/wireless/ath/carl9170/phy.c | |||
@@ -1098,7 +1098,7 @@ static u8 carl9170_interpolate_u8(u8 x, u8 x1, u8 y1, u8 x2, u8 y2) | |||
1098 | * Isn't it just DIV_ROUND_UP(y, 1<<SHIFT)? | 1098 | * Isn't it just DIV_ROUND_UP(y, 1<<SHIFT)? |
1099 | * Can we rely on the compiler to optimise away the div? | 1099 | * Can we rely on the compiler to optimise away the div? |
1100 | */ | 1100 | */ |
1101 | return (y >> SHIFT) + ((y & (1<<(SHIFT-1))) >> (SHIFT - 1)); | 1101 | return (y >> SHIFT) + ((y & (1 << (SHIFT - 1))) >> (SHIFT - 1)); |
1102 | #undef SHIFT | 1102 | #undef SHIFT |
1103 | } | 1103 | } |
1104 | 1104 | ||
@@ -1379,7 +1379,7 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw) | |||
1379 | 1379 | ||
1380 | modes[i].max_power = | 1380 | modes[i].max_power = |
1381 | carl9170_get_max_edge_power(ar, | 1381 | carl9170_get_max_edge_power(ar, |
1382 | freq+f_off, EDGES(ctl_idx, 1)); | 1382 | freq + f_off, EDGES(ctl_idx, 1)); |
1383 | 1383 | ||
1384 | /* | 1384 | /* |
1385 | * TODO: check if the regulatory max. power is | 1385 | * TODO: check if the regulatory max. power is |
@@ -1441,7 +1441,7 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq, | |||
1441 | if (freq < 3000) | 1441 | if (freq < 3000) |
1442 | f = freq - 2300; | 1442 | f = freq - 2300; |
1443 | else | 1443 | else |
1444 | f = (freq - 4800)/5; | 1444 | f = (freq - 4800) / 5; |
1445 | 1445 | ||
1446 | /* | 1446 | /* |
1447 | * cycle through the various modes | 1447 | * cycle through the various modes |