From 894b99f0f1c090e520a1a3942ce8c986b98ecaf5 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 7 Jul 2011 18:13:30 -0400
Subject: [PATCH] --- yaml --- r: 256367 b: refs/heads/master c:
 fdd55d14b7d3a721e60fdc8be12ec0beb9cda8c6 h: refs/heads/master i:   256365:
 1e71cc7514ddfe2f02f52e6e5a543a1646421d8e   256363:
 2bea3e6fa3693cea5a31fc48bf0608d8b8c942bb   256359:
 20a7cdc9dde2b897413cb65549ac201a41326a35   256351:
 4a15ac6cd1e67660b2047a32f8b0430d4639661a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/pcu.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 25eb4433a94a..290583964dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5d381348fcb12d27289b3a66824fb3481911ce
+refs/heads/master: fdd55d14b7d3a721e60fdc8be12ec0beb9cda8c6
diff --git a/trunk/drivers/net/wireless/ath/ath5k/ath5k.h b/trunk/drivers/net/wireless/ath/ath5k/ath5k.h
index 79e11ff40fc3..48bd2ded449e 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/trunk/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -780,7 +780,7 @@ extern int ath5k_modparam_nohwcrypt;
 
 #define AR5K_ASSERT_ENTRY(_e, _s) do {		\
 	if (_e >= _s)				\
-		return (false);			\
+		return false;			\
 } while (0)
 
 /*
diff --git a/trunk/drivers/net/wireless/ath/ath5k/pcu.c b/trunk/drivers/net/wireless/ath/ath5k/pcu.c
index 712a9ac4000e..0a0f63e9675b 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/pcu.c
@@ -536,7 +536,7 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
 
 	WARN_ON( i == ATH5K_MAX_TSF_READ );
 
-	return (((u64)tsf_upper1 << 32) | tsf_lower);
+	return ((u64)tsf_upper1 << 32) | tsf_lower;
 }
 
 /**