Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[pandora-kernel.git] / drivers / net / wireless / ath / carl9170 / phy.c

diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index da1ab96..aa147a9 100644 (file)
--- 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)
         *      Isn't it just DIV_ROUND_UP(y, 1<<SHIFT)?
         *      Can we rely on the compiler to optimise away the div?
         */
-       return (y >> SHIFT) + ((y & (1<<(SHIFT-1))) >> (SHIFT - 1));
+       return (y >> SHIFT) + ((y & (1 << (SHIFT - 1))) >> (SHIFT - 1));
 #undef SHIFT
 }
 
@@ -1379,7 +1379,7 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
 
                        modes[i].max_power =
                                carl9170_get_max_edge_power(ar,
-                                       freq+f_off, EDGES(ctl_idx, 1));
+                                       freq + f_off, EDGES(ctl_idx, 1));
 
                        /*
                         * TODO: check if the regulatory max. power is
@@ -1441,7 +1441,7 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
        if (freq < 3000)
                f = freq - 2300;
        else
-               f = (freq - 4800)/5;
+               f = (freq - 4800) / 5;
 
        /*
         * cycle through the various modes