From patchwork Sat Jun 22 00:17:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram R X-Patchwork-Id: 11011077 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 9D97076 for ; Sat, 22 Jun 2019 00:17:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 864CF28B7D for ; Sat, 22 Jun 2019 00:17:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7921028B80; Sat, 22 Jun 2019 00:17:40 +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 107DD28B7D for ; Sat, 22 Jun 2019 00:17:39 +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: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:In-Reply-To: References:List-Owner; bh=Z38UeA6KzzFE6b5sd3KOEm5QseVTWtWrUHlYt32ACaI=; b=JdX UbUifYEsVodX8nWyIUkqbWJ9Xu6yBIqE9LTBKYhzgeBeYCgZ1qbSZaKD1vZRMxraS0gUzC6HjzAdi ifJ+A0uwvyunhDLRSqeooSbWOTh5LI4Vy/Trq/j+ljsR+RPa1z7JjX4b2P2O5gZN5cIHVV+4Vjr1t m9xONth4REWCBsXISKBkbaaTBLf008SUWcqZ5bwxX+fDNyCAAovYP4W24LcersfgN5Ls/8URigMR6 xggNxOBoQMT6J/sUxrN/V0BEl8Weh1647Yd0mJvRjiZNeG92E6+1TV6v/aT9Uake0JkW+FggxJZz9 W7UUa/j4gbXPc+tMpoWsIOKMjEo+qlA==; 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 1heTis-0006fC-H4; Sat, 22 Jun 2019 00:17:38 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heTiq-0006ek-0t for ath11k@lists.infradead.org; Sat, 22 Jun 2019 00:17:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A725660909; Sat, 22 Jun 2019 00:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162653; bh=ElBA8Cy6hmefTsa+BszgNACB9VctrbDzypxujY4bjA8=; h=From:To:Cc:Subject:Date:From; b=HdAkvR58160MbUh4okzwXe//y5QiwAoFu57laW5y4V9KvFmuJnQjJu0HaJ42K9H4M FAm0iWR8cPy7LsT8RDCiKXVkCmizn8nTho2TS1bWr3HSfTHzhv86IFxLlqNdan88dc HAHv/m05iLIH8rAqmf0DOZI+IbjYT8Otw9Oo3DMk= 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 58EFF6076A; Sat, 22 Jun 2019 00:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162653; bh=ElBA8Cy6hmefTsa+BszgNACB9VctrbDzypxujY4bjA8=; h=From:To:Cc:Subject:Date:From; b=HdAkvR58160MbUh4okzwXe//y5QiwAoFu57laW5y4V9KvFmuJnQjJu0HaJ42K9H4M FAm0iWR8cPy7LsT8RDCiKXVkCmizn8nTho2TS1bWr3HSfTHzhv86IFxLlqNdan88dc HAHv/m05iLIH8rAqmf0DOZI+IbjYT8Otw9Oo3DMk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 58EFF6076A 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 1/4] ath11k: Avoid use of struct initializers for runtime assignment Date: Sat, 22 Jun 2019 05:47:18 +0530 Message-Id: <1561162641-4676-1-git-send-email-srirrama@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190621_171736_116012_06163679 X-CRM114-Status: UNSURE ( 7.39 ) 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 Cleanup the use of REG_RULE struct initializer macro for updating or addinig reg rules at runtime. Rather make use of a separate function to update reg rules while building new regd data. Signed-off-by: Sriram R --- drivers/net/wireless/ath/ath11k/reg.c | 64 +++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c index cc847a7..f181061 100644 --- a/drivers/net/wireless/ath/ath11k/reg.c +++ b/drivers/net/wireless/ath/ath11k/reg.c @@ -468,6 +468,19 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw) } static void +ath11k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq, + u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr, + u32 reg_flags) +{ + reg_rule->freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq); + reg_rule->freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq); + reg_rule->freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw); + reg_rule->power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain); + reg_rule->power_rule.max_eirp = DBM_TO_MBM(reg_pwr); + reg_rule->flags = reg_flags; +} + +static void ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, struct ieee80211_regdomain *regd, struct cur_reg_rule *reg_rule, @@ -482,13 +495,10 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, bw = ath11k_reg_adjust_bw(reg_rule->start_freq, ETSI_WEATHER_RADAR_BAND_LOW, max_bw); - regd->reg_rules[i] = (struct ieee80211_reg_rule) - REG_RULE(reg_rule->start_freq, - ETSI_WEATHER_RADAR_BAND_LOW, - bw, - reg_rule->ant_gain, - reg_rule->reg_power, - flags); + ath11k_reg_update_rule(regd->reg_rules + i, reg_rule->start_freq, + ETSI_WEATHER_RADAR_BAND_LOW, bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); ath11k_dbg(ab, ATH11K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n", @@ -505,13 +515,12 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, bw = ath11k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_LOW, end_freq, max_bw); - regd->reg_rules[++i] = (struct ieee80211_reg_rule) - REG_RULE(ETSI_WEATHER_RADAR_BAND_LOW, - end_freq, - bw, - reg_rule->ant_gain, - reg_rule->reg_power, - flags); + i++; + + ath11k_reg_update_rule(regd->reg_rules + i, + ETSI_WEATHER_RADAR_BAND_LOW, end_freq, bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); regd->reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT; @@ -531,14 +540,12 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab, bw = ath11k_reg_adjust_bw(ETSI_WEATHER_RADAR_BAND_HIGH, reg_rule->end_freq, max_bw); - regd->reg_rules[++i] = - (struct ieee80211_reg_rule) - REG_RULE(ETSI_WEATHER_RADAR_BAND_HIGH, - reg_rule->end_freq, - bw, - reg_rule->ant_gain, - reg_rule->reg_power, - flags); + i++; + + ath11k_reg_update_rule(regd->reg_rules + i, ETSI_WEATHER_RADAR_BAND_HIGH, + reg_rule->end_freq, bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); ath11k_dbg(ab, ATH11K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n", @@ -616,14 +623,11 @@ ath11k_reg_build_regd(struct ath11k_base *ab, flags |= ath11k_map_fw_reg_flags(reg_rule->flags); - tmp_regd->reg_rules[i] = - (struct ieee80211_reg_rule) - REG_RULE(reg_rule->start_freq, - reg_rule->end_freq, - max_bw, - reg_rule->ant_gain, - reg_rule->reg_power, - flags); + ath11k_reg_update_rule(tmp_regd->reg_rules + i, + reg_rule->start_freq, + reg_rule->end_freq, max_bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); /* Update dfs cac timeout if the dfs domain is ETSI and the * new rule covers weather radar band. From patchwork Sat Jun 22 00:17:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram R X-Patchwork-Id: 11011079 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 DBC4B76 for ; Sat, 22 Jun 2019 00:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBA5B28B7D for ; Sat, 22 Jun 2019 00:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFFCE28B80; Sat, 22 Jun 2019 00:17:44 +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 7B26728B7D for ; Sat, 22 Jun 2019 00:17:44 +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=HIBiUSvfSk9Ls8gWM06Wd64AQzCXYYLYp3iarGPBhy4=; b=U+sCW7ys7QZxDv3kjmF4GABzEl RbWTWndLA50OUybvVR2hftOb07MzBmK82aHI9EIqtu6H4cQHvqInR/Ok70ev12ULZejohu1jqaeBG OjMNjwBhJZBilOo1IDQlTMLVSqA7OcOvrITi4jJlVN25zhi+RWID+uNMrtVIC3wMTLVz0Kg33qSLq ElcwUp0axwxoex25pgFeG8lCI/FHNzCWkPGIdMkb5CJXvMq2Quq7coZidltGsHb0c+q030jyrhcZN HRzOw76okzZGhS7jylUqDh4uGEeVF3qe1j/YpTvEJicsVx8x2WbXdSufwPISNLnRIgwMBSm8Ed/BU /ziaqV9g==; 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 1heTix-0006gY-Nk; Sat, 22 Jun 2019 00:17:43 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heTiv-0006g0-7f for ath11k@lists.infradead.org; Sat, 22 Jun 2019 00:17:42 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 02438608BA; Sat, 22 Jun 2019 00:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162661; bh=IWtaxeRY8gmSq28drDzHN3b5JOY0qrJGoJoEImfi95I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OhI64t6gX8xjS/0UPaOAuUWJvPifl9y84vuGj/cFlQyHn2ABm76AoWzFTOjxd1+sR G/+tFK8oK7bsq6yoAkAkM5qrCtONrl5GKfAVNrxZ/A8thNEJ7K/wbeACSjw1N88IXb yVjAy8Ctqv2q6h9qJnxn/0nyMKWkTYso98bonYuA= 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 B277A60867; Sat, 22 Jun 2019 00:17:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162660; bh=IWtaxeRY8gmSq28drDzHN3b5JOY0qrJGoJoEImfi95I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgyKklgbZiQFDRL9/aF//A85vvcrzF6b1BrtIaBkka7e6orAYoCf7pBMyArtbWaDk 9UqpkYs2TzoJLg3dSNFmC/y+Hn5+q+oAfvmfh3u/0oWM+rrVbs2YuRXiJKDzGLhH4Q SCcyAdaGbE2PqXbxh7+2UOzSW5QTxnjbwWEo2BJA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org B277A60867 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 2/4] ath11k: modify code styling for boolean function return values Date: Sat, 22 Jun 2019 05:47:19 +0530 Message-Id: <1561162641-4676-2-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_171741_288065_0B2D015F X-CRM114-Status: UNSURE ( 9.25 ) 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 Modify code styling for boolean function return values by directly comparing memcmp() result with 0. Signed-off-by: Sriram R --- drivers/net/wireless/ath/ath11k/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c index f181061..1b1dd88 100644 --- a/drivers/net/wireless/ath/ath11k/reg.c +++ b/drivers/net/wireless/ath/ath11k/reg.c @@ -38,7 +38,7 @@ static bool ath11k_regdom_changes(struct ath11k *ar, char *alpha2) if (!regd) return true; - return !!(memcmp(regd->alpha2, alpha2, 2)); + return memcmp(regd->alpha2, alpha2, 2) != 0; } static void 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 * From patchwork Sat Jun 22 00:17:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram R X-Patchwork-Id: 11011083 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 4EFC46C5 for ; Sat, 22 Jun 2019 00:17:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D83428B7E for ; Sat, 22 Jun 2019 00:17:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 319EE28B7D; Sat, 22 Jun 2019 00:17:50 +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 DC5A128B7D for ; Sat, 22 Jun 2019 00:17:49 +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=SDCU6G6es6e79MUUZ+mGJgWBcErP75tPc/7X6kMui8M=; b=MAodWzo4jkLpIqmB/v/dKYZoBs UrWAg0ogVxKrIGjd+ozyhzgHB7ktsjeCHGywWFK77A2Q3r4TcpAZaOGs2K0vNjeTeeRhzrz+5vifQ YQ5G1GVljXNXyMn8iswh/rbKe3FPTziIEOQyMBKsFvVhZOTVHMF0wTIKno41KCUUHpogB2g/XV6Mq UxP9i9eNBhNkJZsytTDqXUBW87QdjmdYHIDoz57LY2hC3mKjMCuYZaSn2eN+jVGk4FFny7n37pBo5 U4WjYz3Rax9Lb9s8ZG+nLJlTG/Y/R4uUMQR8f7y9Y4Oc00xvjBSHMkhvKwy+iejqj82aoPKf8lyNR 34VhyPrw==; 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 1heTj3-0006im-7E; Sat, 22 Jun 2019 00:17:49 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heTj0-0006hh-Iz for ath11k@lists.infradead.org; Sat, 22 Jun 2019 00:17:47 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 533E360E5A; Sat, 22 Jun 2019 00:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162666; bh=JeqHC4IAY0KyA0dGSb3YgB3XkeN1GGC5qC5ZnlwOVxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c7qpso8Jr/cRb6yd1YVRE5Iweya94EzpY56EZ9Ht0yH9DHQ+L/O/VRlxqQ2PlOSiv 4T1B7aHsAT/sune5Hc8eBcPm6y/SZo3/NaYCpdkOb+esoK3grIhd1gEWDD0s21SsSB qhqAjGnzqgZdTMko5Yo5Fu/n0Yj0K01z/ef3YSNc= 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 22B5360D0C; Sat, 22 Jun 2019 00:17:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1561162666; bh=JeqHC4IAY0KyA0dGSb3YgB3XkeN1GGC5qC5ZnlwOVxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c7qpso8Jr/cRb6yd1YVRE5Iweya94EzpY56EZ9Ht0yH9DHQ+L/O/VRlxqQ2PlOSiv 4T1B7aHsAT/sune5Hc8eBcPm6y/SZo3/NaYCpdkOb+esoK3grIhd1gEWDD0s21SsSB qhqAjGnzqgZdTMko5Yo5Fu/n0Yj0K01z/ef3YSNc= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 22B5360D0C 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 4/4] ath11k: Remove stray character in reg notifier debug log Date: Sat, 22 Jun 2019 05:47:21 +0530 Message-Id: <1561162641-4676-4-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_171746_638476_05D29627 X-CRM114-Status: UNSURE ( 9.37 ) 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 Remove stray character 'n' used in debug message of ath11k_reg_notifier() Signed-off-by: Sriram R --- drivers/net/wireless/ath/ath11k/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c index da8c6c2..f72b81f 100644 --- a/drivers/net/wireless/ath/ath11k/reg.c +++ b/drivers/net/wireless/ath/ath11k/reg.c @@ -50,7 +50,7 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) int ret; ath11k_dbg(ar->ab, ATH11K_DBG_REG, - "Regulatory Notification received for %s n", wiphy_name(wiphy)); + "Regulatory Notification received for %s\n", wiphy_name(wiphy)); /* Currently supporting only General User Hints. Cell base user * hints to be handled later.