diff options
author | David Miller <davem@davemloft.net> | 2008-02-15 19:08:59 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-20 20:11:48 -0500 |
commit | 04f93a87a2db84e7214a4ec56fccd2289e973ce5 (patch) | |
tree | 9afb7d4845759a9d1c9e9a92b94a7b3d6183c653 | |
parent | b988763857426020e50a19434c8434a1e08e70eb (diff) |
ath5k: Fix build warnings on some 64-bit platforms.
'u64' is not necessarily 'unsigned long long'
drivers/net/wireless/ath5k/base.c: In function 'ath5k_beacon_update_timers':
drivers/net/wireless/ath5k/base.c:2130: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
drivers/net/wireless/ath5k/base.c:2130: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
drivers/net/wireless/ath5k/base.c: In function 'ath5k_intr':
drivers/net/wireless/ath5k/base.c:2391: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 81b45b3e0f02..bef967ce34a6 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -2130,8 +2130,9 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf) | |||
2130 | "updated timers based on beacon TSF\n"); | 2130 | "updated timers based on beacon TSF\n"); |
2131 | 2131 | ||
2132 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, | 2132 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, |
2133 | "bc_tsf %llx hw_tsf %llx bc_tu %u hw_tu %u nexttbtt %u\n", | 2133 | "bc_tsf %llx hw_tsf %llx bc_tu %u hw_tu %u nexttbtt %u\n", |
2134 | bc_tsf, hw_tsf, bc_tu, hw_tu, nexttbtt); | 2134 | (unsigned long long) bc_tsf, |
2135 | (unsigned long long) hw_tsf, bc_tu, hw_tu, nexttbtt); | ||
2135 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, "intval %u %s %s\n", | 2136 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, "intval %u %s %s\n", |
2136 | intval & AR5K_BEACON_PERIOD, | 2137 | intval & AR5K_BEACON_PERIOD, |
2137 | intval & AR5K_BEACON_ENA ? "AR5K_BEACON_ENA" : "", | 2138 | intval & AR5K_BEACON_ENA ? "AR5K_BEACON_ENA" : "", |
@@ -2389,10 +2390,11 @@ ath5k_intr(int irq, void *dev_id) | |||
2389 | u64 tsf = ath5k_hw_get_tsf64(ah); | 2390 | u64 tsf = ath5k_hw_get_tsf64(ah); |
2390 | sc->nexttbtt += sc->bintval; | 2391 | sc->nexttbtt += sc->bintval; |
2391 | ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, | 2392 | ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, |
2392 | "SWBA nexttbtt: %x hw_tu: %x " | 2393 | "SWBA nexttbtt: %x hw_tu: %x " |
2393 | "TSF: %llx\n", | 2394 | "TSF: %llx\n", |
2394 | sc->nexttbtt, | 2395 | sc->nexttbtt, |
2395 | TSF_TO_TU(tsf), tsf); | 2396 | TSF_TO_TU(tsf), |
2397 | (unsigned long long) tsf); | ||
2396 | } else { | 2398 | } else { |
2397 | ath5k_beacon_send(sc); | 2399 | ath5k_beacon_send(sc); |
2398 | } | 2400 | } |