From patchwork Sat Jun 22 00:17:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram R X-Patchwork-Id: 11011081 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 134336C5 for ; Sat, 22 Jun 2019 00:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0331528B7D for ; Sat, 22 Jun 2019 00:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBBE828B80; Sat, 22 Jun 2019 00:17:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 969E728B7D for ; Sat, 22 Jun 2019 00:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dj7/Qu/J56bqvm3UmFuqtpkEVTOMws8MKLndeybJ+Gk=; b=Vz6aJKJtwkbSWr5V1y3jaDUUex uwvaWU78D8NIYzRs1t8pRJ9gDW/7FC0myWCJTl3zGtaB9TU5mSSwAlId1Wtu4+Q3U/IMR3tMSIHLg az9c3IpGysGeE3ek4LGNcTQLS50fApMsNAFl7RrCEoFEsTXK3yLLYmZuRKk4yjGVpNJTlfwKgpC8C QntHDSgvvZGK78ulDwZuYxIV5o7cTcKdW+/AMwDz3A4pCODpiHFH/5hlT296/3oNdIGICcCPRKPEA vdLJwTNDdEVanNNPWXifxXy5nfOt8bC5HTcDSfNFyZkHwmj8QlGaKhOBa8YTOPWEVg9f2CcImIjs/ g1+417UQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1heTj0-0006hu-Uv; Sat, 22 Jun 2019 00:17:46 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heTiy-0006gm-1M for ath11k@lists.infradead.org; Sat, 22 Jun 2019 00:17:45 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B7BB160CEC; Sat, 22 Jun 2019 00:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162663; bh=KybxZx5xDW+jqSfjRlUv0O2I7sfTTPXdFjLMgn5l2AI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ei8QN5pBR+ZvSaw8A0mcqDu6d3RQrRBTokZ5BEjhDGyYUxC6KOHBkCsxBqhwCzOm5 oMQ9nvbWcnS5zoliCViAQ6ftjkyJyymUzu3p6M4FhlX20Q0zCKtE4n6OIUrP28MdOG bskhdCjg41T9o5CqCiuSTGf/eDBCs2qMPJ/lYHh4= Received: from checstp253621-lin.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: srirrama@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 70D2E60A00; Sat, 22 Jun 2019 00:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162663; bh=KybxZx5xDW+jqSfjRlUv0O2I7sfTTPXdFjLMgn5l2AI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ei8QN5pBR+ZvSaw8A0mcqDu6d3RQrRBTokZ5BEjhDGyYUxC6KOHBkCsxBqhwCzOm5 oMQ9nvbWcnS5zoliCViAQ6ftjkyJyymUzu3p6M4FhlX20Q0zCKtE4n6OIUrP28MdOG bskhdCjg41T9o5CqCiuSTGf/eDBCs2qMPJ/lYHh4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 70D2E60A00 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=srirrama@codeaurora.org From: Sriram R To: ath11k@lists.infradead.org Subject: [PATCH 3/4] ath11k: replace locally defined MACRO's with actual functions Date: Sat, 22 Jun 2019 05:47:20 +0530 Message-Id: <1561162641-4676-3-git-send-email-srirrama@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561162641-4676-1-git-send-email-srirrama@codeaurora.org> References: <1561162641-4676-1-git-send-email-srirrama@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190621_171744_114814_DD6444F1 X-CRM114-Status: UNSURE ( 8.56 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sriram R MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace use of locally defined MIN/MAX macros with actual min_t/max_t functions respectively. Signed-off-by: Sriram R --- 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 *