From 70469bf5e3ad05c6e8703f7fdbc1f76e4bf9824e Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 3 Aug 2009 12:24:49 -0700
Subject: [PATCH] --- yaml --- r: 159417 b: refs/heads/master c:
 6b827529058d6d479f31b281a9ec630f7b6841e1 h: refs/heads/master i:   159415:
 bd79a9d75ae5cb1660202e806e4a5941aadcd0a9 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/phy.c | 41 ++++++++--------------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 5eef59118cfb..99b5fee7ee5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39a21951efc99e040a7d66449f63910e439b97e9
+refs/heads/master: 6b827529058d6d479f31b281a9ec630f7b6841e1
diff --git a/trunk/drivers/net/wireless/ath/ath9k/phy.c b/trunk/drivers/net/wireless/ath/ath9k/phy.c
index 06fd057e467b..98b1b56d87c4 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/phy.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/phy.c
@@ -266,32 +266,21 @@ ath9k_hw_set_rf_regs(struct ath_hw *ah, struct ath9k_channel *chan,
 void
 ath9k_hw_rfdetach(struct ath_hw *ah)
 {
-	kfree(ah->analogBank0Data);
-	ah->analogBank0Data = NULL;
-
-	kfree(ah->analogBank1Data);
-	ah->analogBank1Data = NULL;
-
-	kfree(ah->analogBank2Data);
-	ah->analogBank2Data = NULL;
-
-	kfree(ah->analogBank3Data);
-	ah->analogBank3Data = NULL;
-
-	kfree(ah->analogBank6Data);
-	ah->analogBank6Data = NULL;
-
-	kfree(ah->analogBank6TPCData);
-	ah->analogBank6TPCData = NULL;
-
-	kfree(ah->analogBank7Data);
-	ah->analogBank7Data = NULL;
-
-	kfree(ah->addac5416_21);
-	ah->addac5416_21 = NULL;
-
-	kfree(ah->bank6Temp);
-	ah->bank6Temp = NULL;
+#define ATH_FREE_BANK(bank) do { \
+		kfree(bank); \
+		bank = NULL; \
+	} while (0);
+
+	ATH_FREE_BANK(ah->analogBank0Data);
+	ATH_FREE_BANK(ah->analogBank1Data);
+	ATH_FREE_BANK(ah->analogBank2Data);
+	ATH_FREE_BANK(ah->analogBank3Data);
+	ATH_FREE_BANK(ah->analogBank6Data);
+	ATH_FREE_BANK(ah->analogBank6TPCData);
+	ATH_FREE_BANK(ah->analogBank7Data);
+	ATH_FREE_BANK(ah->addac5416_21);
+	ATH_FREE_BANK(ah->bank6Temp);
+#undef ATH_FREE_BANK
 }
 
 bool ath9k_hw_init_rf(struct ath_hw *ah, int *status)