From patchwork Thu Mar 14 14:07:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 10852929 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 E3A1E1669 for ; Thu, 14 Mar 2019 14:08:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDA0129EDF for ; Thu, 14 Mar 2019 14:08:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C20B829F3E; Thu, 14 Mar 2019 14:08:05 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63A2F29EDF for ; Thu, 14 Mar 2019 14:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727542AbfCNOIE (ORCPT ); Thu, 14 Mar 2019 10:08:04 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41404 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727164AbfCNOIE (ORCPT ); Thu, 14 Mar 2019 10:08:04 -0400 Received: by mail-wr1-f65.google.com with SMTP id p1so6010167wrs.8 for ; Thu, 14 Mar 2019 07:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K7qDNYQhuNVtmRf9iZuFYX3oKITVG4bK/5SK8vlyYcw=; b=Xg47XYns4SuKqiAtvK0Nr9zsF5Pycn94F4ZyOdNrPTeeVVteIs6yfTwD1eg2DAvwjf dZ0cl7kKvYYoLoGwyiWfXHA4z7y7HiA7uFuS/zjSMxWhsLAhczhKzaUPFAi1+1uk5DZI jpB6EQS1gYkkXPU4vAcA5tKF/M2rEFZW1Nl7+lTxfimZ6ew+0OzKXUJOWUZfyDqsHA5m 7n/qqBNezyjBhqSe5pYVJ04aFQshsLuuC9NXMk3WubtHdlXaZ+JSvZVVIfjdC/uw1rsm J6wFQIY6dt/Cy/vgQRsXWwb1wsDumnI/FOgHA3Tg0oWPm7M+IOnzC1jS6TL90oaeq6By bjQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K7qDNYQhuNVtmRf9iZuFYX3oKITVG4bK/5SK8vlyYcw=; b=qf9TuLx6Stp/INEao7Q7+H6PZD/zJlEQ3QhvYlJc+4R/gGwFa22T/5kvHKS0SLnMSz +MB3W+j4h6CY6XTUbYG2JWwqWVxxZ5ciqadrgMLT8342h3oR79QC9ikVp7CxeHyHw8Wv BUKRxv/vdnrvxxQKkcMZAlqqZvQRWI5fwPJYJEQNN3ZUsYlUhkfhBfG92qaAVONNmGXg 204zGFBcJ391F3AhQSXMqZfPo0yTgLW6LfzG5LVW5R6DwwfiD2FP4szzncnkeI4Hed+8 p5tLyuv4D9OvZVMgsPjUSw/Yz7LHc++8Ao5JeXor8xwblzfd6qXtuZ8hpu4b7FV2EbG+ iu9A== X-Gm-Message-State: APjAAAUdD+SKTJCY/7Ed2c8F1S7Fq47bjOjJCTKeU58yIfDyy6Viy+qJ 4zy+DeVRPuwsqCPFBQ/+zBP9FtsK X-Google-Smtp-Source: APXvYqz8zyXdEGQZ89S4w2OS7xE4cKNV4VxRJ/BJjBFZeC7jr1nsp1XHLrz+P4Y+SI+cHWWVwH2cMQ== X-Received: by 2002:adf:f5cf:: with SMTP id k15mr13761076wrp.218.1552572482495; Thu, 14 Mar 2019 07:08:02 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id i12sm23127722wrq.21.2019.03.14.07.08.01 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 07:08:01 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org Subject: [PATCH v2 1/2] ath: drop duplicated define Date: Thu, 14 Mar 2019 15:07:49 +0100 Message-Id: <1552572470-2656-1-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove duplicate NO_CTL that is just 2 lines below. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/regd.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h index 75ddaef..8d5a16b 100644 --- a/drivers/net/wireless/ath/regd.h +++ b/drivers/net/wireless/ath/regd.h @@ -28,7 +28,6 @@ enum ctl_group { CTL_ETSI = 0x30, }; -#define NO_CTL 0xff #define SD_NO_CTL 0xE0 #define NO_CTL 0xff #define CTL_11A 0 From patchwork Thu Mar 14 14:07:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Psyborg X-Patchwork-Id: 10852931 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 CAC8414DE for ; Thu, 14 Mar 2019 14:08:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B206329EDF for ; Thu, 14 Mar 2019 14:08:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A642B29F8C; Thu, 14 Mar 2019 14:08:06 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BB5029EDF for ; Thu, 14 Mar 2019 14:08:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727547AbfCNOIF (ORCPT ); Thu, 14 Mar 2019 10:08:05 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50780 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727356AbfCNOIF (ORCPT ); Thu, 14 Mar 2019 10:08:05 -0400 Received: by mail-wm1-f67.google.com with SMTP id x7so3163600wmj.0 for ; Thu, 14 Mar 2019 07:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jsUyLRLziJ6dyhty5uCMt9SOzOgYYNIhxD1vrGAqY6E=; b=I5g+yOIn943XA048LSccpSxvxJyE/8Ke5HOfHPRUQGKR99OsCxMwxZryHs9LsB+NAN mSJ/6F7/RvoynK3ZKlPW1lH5eF9LG24pWTB8oPUElVnvc2jd0ZcVsH0RGqnC50pHz9gZ f1gQP1E3XgQgzBsFK6CJarGsfSSfceHX6zaaOulKe05NwsVGv7NDtFGW27YCfJE1dBuV iHVK9JPu0IRVkMnRZtdDQS56A3JaZ1yeKm8L019BnCRHpH7LoAL0W451ORCK1ildKQJa tLfggsmZEfHbok2/XpYnx2FXFhxYn76yN847/e6CxIXa7tBYuZBloTkZ08WmegYXl/CZ LriA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jsUyLRLziJ6dyhty5uCMt9SOzOgYYNIhxD1vrGAqY6E=; b=p38S6waFeKgIDvm7aUfbEgQHkUWRbepyUCN5gZ36xYaHfczx1CEy45ebPCYUYrRZuP hWvHfza/5k1BIiqkYFbgqutth5zi0pBSBRxl2mvZcI7VB0BdMJomZ7qflicTaGHzXZtq QsKnLHK2apQ2mB6UtGrI0OZjo2EgvyoM0Lzeia+r31XdA3Oid2fJnyaEv4sO8/HPkFee XZc7PQXWIUEMxNZhea2xG5K/ailsDnQ+brO1Gt+8LzpWzkc7spxavQPIknsvtSq8VE/h q5K5pfvH/vbyRLLhE4NIuyjdTxzygylrQNQgihZ1tS5gvIGUJXBbQbzhmPb5ElCNyg08 J41Q== X-Gm-Message-State: APjAAAVxz4hM104eWufidNE6/OjiJqMscVEHi4iLkJQg4cJRmGDd4r83 AbhWW0yzUEsjcF9mrtCyZkZv2aY3 X-Google-Smtp-Source: APXvYqxIy/Df/PnQeqRLrrQBmfdkMI1EWgMeFen3mShflQPQh+hLDxWPSbkvxgXpmKMrr2Hf5AjrDQ== X-Received: by 2002:a7b:c1cf:: with SMTP id a15mr2723982wmj.60.1552572483451; Thu, 14 Mar 2019 07:08:03 -0700 (PDT) Received: from localhost.localdomain ([31.147.208.18]) by smtp.googlemail.com with ESMTPSA id i12sm23127722wrq.21.2019.03.14.07.08.02 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 07:08:02 -0700 (PDT) From: =?utf-8?q?Tomislav_Po=C5=BEega?= To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org Subject: [PATCH v2 2/2] ath9k: drop redundant code in ar9003_hw_set_channel Date: Thu, 14 Mar 2019 15:07:50 +0100 Message-Id: <1552572470-2656-2-git-send-email-pozega.tomislav@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1552572470-2656-1-git-send-email-pozega.tomislav@gmail.com> References: <1552572470-2656-1-git-send-email-pozega.tomislav@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AR9330, AR9485, AR9531, AR9550, AR9561 and AR9565 all use same channel set register configuration which allows for small code size reduction. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index 98c5f52..daf30f9 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -157,7 +157,9 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan) freq = centers.synth_center; if (freq < 4800) { /* 2 GHz, fractional mode */ - if (AR_SREV_9330(ah)) { + if (AR_SREV_9330(ah) || AR_SREV_9485(ah) || + AR_SREV_9531(ah) || AR_SREV_9550(ah) || + AR_SREV_9561(ah) || AR_SREV_9565(ah)) { if (ah->is_clk_25mhz) div = 75; else @@ -166,16 +168,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan) channelSel = (freq * 4) / div; chan_frac = (((freq * 4) % div) * 0x20000) / div; channelSel = (channelSel << 17) | chan_frac; - } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) { - /* - * freq_ref = 40 / (refdiva >> amoderefsel); - * where refdiva=1 and amoderefsel=0 - * ndiv = ((chan_mhz * 4) / 3) / freq_ref; - * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000 - */ - channelSel = (freq * 4) / 120; - chan_frac = (((freq * 4) % 120) * 0x20000) / 120; - channelSel = (channelSel << 17) | chan_frac; } else if (AR_SREV_9340(ah)) { if (ah->is_clk_25mhz) { channelSel = (freq * 2) / 75; @@ -184,16 +176,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan) } else { channelSel = CHANSEL_2G(freq) >> 1; } - } else if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || - AR_SREV_9561(ah)) { - if (ah->is_clk_25mhz) - div = 75; - else - div = 120; - - channelSel = (freq * 4) / div; - chan_frac = (((freq * 4) % div) * 0x20000) / div; - channelSel = (channelSel << 17) | chan_frac; } else { channelSel = CHANSEL_2G(freq); }