ATH11K Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Sriram R <srirrama@codeaurora.org>
To: ath11k@lists.infradead.org
Cc: Sriram R <srirrama@codeaurora.org>
Subject: [PATCH 3/4] ath11k: replace locally defined MACRO's with actual functions
Date: Sat, 22 Jun 2019 05:47:20 +0530	[thread overview]
Message-ID: <1561162641-4676-3-git-send-email-srirrama@codeaurora.org> (raw)
In-Reply-To: <1561162641-4676-1-git-send-email-srirrama@codeaurora.org>

Replace use of locally defined MIN/MAX macros with actual
min_t/max_t functions respectively.

Signed-off-by: Sriram R <srirrama@codeaurora.org>
---
 drivers/net/wireless/ath/ath11k/reg.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 1b1dd88..da8c6c2 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -339,9 +339,6 @@ static void ath11k_reg_intersect_rules(struct ieee80211_reg_rule *rule1,
 				       struct ieee80211_reg_rule *rule2,
 				       struct ieee80211_reg_rule *new_rule)
 {
-	#define MAX(a, b) max_t(u32, a, b)
-	#define MIN(a, b) min_t(u32, a, b)
-
 	u32 start_freq1, end_freq1;
 	u32 start_freq2, end_freq2;
 	u32 freq_diff, max_bw;
@@ -352,30 +349,29 @@ static void ath11k_reg_intersect_rules(struct ieee80211_reg_rule *rule1,
 	end_freq1 = rule1->freq_range.end_freq_khz;
 	end_freq2 = rule2->freq_range.end_freq_khz;
 
-	new_rule->freq_range.start_freq_khz = MAX(start_freq1, start_freq2);
-	new_rule->freq_range.end_freq_khz = MIN(end_freq1, end_freq2);
+	new_rule->freq_range.start_freq_khz = max_t(u32, start_freq1,
+						    start_freq2);
+	new_rule->freq_range.end_freq_khz = min_t(u32, end_freq1, end_freq2);
 
 	freq_diff = new_rule->freq_range.end_freq_khz -
 			new_rule->freq_range.start_freq_khz;
-	max_bw = MIN(rule1->freq_range.max_bandwidth_khz,
-		     rule2->freq_range.max_bandwidth_khz);
-	new_rule->freq_range.max_bandwidth_khz = MIN(max_bw, freq_diff);
+	max_bw = min_t(u32, rule1->freq_range.max_bandwidth_khz,
+		       rule2->freq_range.max_bandwidth_khz);
+	new_rule->freq_range.max_bandwidth_khz = min_t(u32, max_bw, freq_diff);
 
 	new_rule->power_rule.max_antenna_gain =
-		MIN(rule1->power_rule.max_antenna_gain,
-		    rule2->power_rule.max_antenna_gain);
+		min_t(u32, rule1->power_rule.max_antenna_gain,
+		      rule2->power_rule.max_antenna_gain);
 
-	new_rule->power_rule.max_eirp = MIN(rule1->power_rule.max_eirp,
-					    rule2->power_rule.max_eirp);
+	new_rule->power_rule.max_eirp = min_t(u32, rule1->power_rule.max_eirp,
+					      rule2->power_rule.max_eirp);
 
 	/* Use the flags of both the rules */
 	new_rule->flags = rule1->flags | rule2->flags;
 
 	/* To be safe, lts use the max cac timeout of both rules */
-	new_rule->dfs_cac_ms = MAX(rule1->dfs_cac_ms, rule2->dfs_cac_ms);
-
-	#undef MAX
-	#undef MIN
+	new_rule->dfs_cac_ms = max_t(u32, rule1->dfs_cac_ms,
+				     rule2->dfs_cac_ms);
 }
 
 static struct ieee80211_regdomain *
-- 
2.7.4


_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

  parent reply	other threads:[~2019-06-22  0:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-22  0:17 [PATCH 1/4] ath11k: Avoid use of struct initializers for runtime assignment Sriram R
2019-06-22  0:17 ` [PATCH 2/4] ath11k: modify code styling for boolean function return values Sriram R
2019-06-22  0:17 ` Sriram R [this message]
2019-06-22  0:17 ` [PATCH 4/4] ath11k: Remove stray character in reg notifier debug log Sriram R
2019-06-24 10:51 ` [PATCH 1/4] ath11k: Avoid use of struct initializers for runtime assignment Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1561162641-4676-3-git-send-email-srirrama@codeaurora.org \
    --to=srirrama@codeaurora.org \
    --cc=ath11k@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox