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.