From patchwork Sat Oct 22 15:15:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragan Cvetic X-Patchwork-Id: 7897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1248469wrr; Sat, 22 Oct 2022 08:19:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Znzfsb/2q08fDwVewawMKQX4h0QFgS9MampYwo6oW1QAXmPvig16sWA1FEvhVVbbhlsh0 X-Received: by 2002:a17:906:9bd8:b0:78d:85f9:36ae with SMTP id de24-20020a1709069bd800b0078d85f936aemr20723659ejc.342.1666451966627; Sat, 22 Oct 2022 08:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666451966; cv=none; d=google.com; s=arc-20160816; b=hpNwIqrWnPp028vA7cvqWL+J2qfwN6S4BHnKNgQ/DHsdwx4X6As2hGoshqM7wVpjGn +Ku/ol8r7CFfEzzBWUin2qoWuEVAxim/J6Be15bCYd2De77afhEkvCq3roSjwKz7vtOV aivl+DVUREhW+pAL4aFCxT8K6YEwFzd9JC42a5ZWHM132UpFADKK0dv/GnqzhH1v2Jy7 GI66T2roqlIqoZu2qqSdZV/raBDJfTFYn3iUb3ar9lUTlpndIKDLJOXLBPAwnWgYxmyP lBh4JgabQLIW8HlExYJo2Eq4jy6js3HRnrkmNfzIuGXDKizk44AX480tOE4zrZECvmFJ Qeyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8Jgkn6OfqAyiEvejOypPSqSRTA/MOiZm5EcEVKn+2uE=; b=WuK08I9QqSI3vw7iPyWFi6Py+fFzGtUlM6ZlT8lUkLF3EZVFIn4sZcLGk/wplGH7lC fhMtfOYHvHbsRtnny+soebNxaFlr9SR0kLuNQwCMPbWcsI2oAx+uuKEgMFJg3ekC+oBs 1Ns6g/aarvvF/ehejYYYoyvsoz1UXkOjjM2ohFQWpfgSklMhV7+RNVLqEyaGBn6eG4o/ 8Z+zeEIq+yepLlXptDY3uA2rHMvDZuX4d9UB5DgDzlu2wFe1y6iJdnuxyb15Nhv8kJx8 zrEw+XAfxRSqfi2vP8+fn9151J8CVL08fqYoEWfI7OaNhAWHXqixaO/7LuolHfmi9Qj4 2iAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dbVeY+pF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs29-20020a1709073e9d00b0078262e3839esi17834678ejc.27.2022.10.22.08.19.00; Sat, 22 Oct 2022 08:19:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dbVeY+pF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbiJVPPW (ORCPT + 99 others); Sat, 22 Oct 2022 11:15:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiJVPPU (ORCPT ); Sat, 22 Oct 2022 11:15:20 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97E625D0F5 for ; Sat, 22 Oct 2022 08:15:12 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id a10so8646333wrm.12 for ; Sat, 22 Oct 2022 08:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8Jgkn6OfqAyiEvejOypPSqSRTA/MOiZm5EcEVKn+2uE=; b=dbVeY+pFbc93fi6B+PvXj7os/miItIpZVlnucda0Fd2zzyiYAt2TvIePXqEMjSvusf QqZ88STDB4oEiMWKyvZECvam0+iJMIz2qSnk7O/ZDmlg93MIsbnpCkkkcCku0HN82yOV W3d7KiONyFs058InLsf1aEF3is1wOLkpbxQ3JO4WxQ+DHRwtDD4A88K1JjdnaSYFQ+49 3Izx3ByU9rss31y0m71cFLsSUKAss5vCrJ4n6bJkVqqaNL7x/7jwi2ATflkLo2fY1Fgo D55HhPPdKObHkJUhn4L6DBAUKTXsPrbTH58HAOBhgulI2kKqFDZSUN00ccKKGgXkcC4P MBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8Jgkn6OfqAyiEvejOypPSqSRTA/MOiZm5EcEVKn+2uE=; b=lVJFryUxagj+bw/KrNEHjpaGlAFDBUNngoT/jKEkw3mg9nnfqasxH8ppgiP1ls4KL3 n4391zzowVV+ZEvRdhuw3vaY+pnO1KxuetFbxNVBZ+BUrNOGFeKu4+0lmdzJlsAoz+Vl HcfGrJqftXljU706+TIGi3W0GnU06C6z5Lr0A6WU4yLNK7IbpyQMJW9kO4UVqQwYVuCA ElrDwhqVpOaLXEuhsF/xG0Ykpr4qiOf/heYZ9prXGGHWYK6Go9+BnHc7RtvzVsRqvDNW LJFWulegFfMuNocMKT9mB/L0kPHVDsjmyVnvNewx7GxatPIeZJUA2a6d/G6Z2iOU+5ga KMzA== X-Gm-Message-State: ACrzQf3tpXH1PIncQWr8lFOb9LMeeMvFMvsDFd6nwUl51LfXOPzh1s0t wwE+3Guz3U+T2U77wOQ5982rz9xBH1c= X-Received: by 2002:adf:f501:0:b0:22c:cbea:240a with SMTP id q1-20020adff501000000b0022ccbea240amr16201520wro.78.1666451710929; Sat, 22 Oct 2022 08:15:10 -0700 (PDT) Received: from localhost.localdomain ([176.61.123.135]) by smtp.gmail.com with ESMTPSA id e14-20020a5d4e8e000000b0023655e51c14sm3802472wru.32.2022.10.22.08.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 08:15:10 -0700 (PDT) From: Dragan Cvetic To: philipp.g.hortmann@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dragan Cvetic Subject: [PATCH v2] staging: rtl8192e: Rename Enable, cck_Rx_path and disabledRF Date: Sat, 22 Oct 2022 16:15:06 +0100 Message-Id: <20221022151506.63725-1-dragan.m.cvetic@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747401537264958881?= X-GMAIL-MSGID: =?utf-8?q?1747401537264958881?= Rename variable Enable to enable, cck_Rx_path to cck_rx_path and disabledRF to disabled_rf to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Dragan Cvetic --- v1 -> v2: Rebase to latest version to avoid merge conflicts. --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index c9e495538e2c..4a65868270a4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1722,7 +1722,7 @@ void rtl92e_dm_rf_pathcheck_wq(void *data) else priv->brfpath_rxenable[i] = false; } - if (!DM_RxPathSelTable.Enable) + if (!DM_RxPathSelTable.enable) return; _rtl92e_dm_rx_path_sel_byrssi(dev); @@ -1733,14 +1733,14 @@ static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev) u8 i; struct r8192_priv *priv = rtllib_priv(dev); - DM_RxPathSelTable.Enable = 1; + DM_RxPathSelTable.enable = 1; DM_RxPathSelTable.SS_TH_low = RxPathSelection_SS_TH_low; DM_RxPathSelTable.diff_TH = RxPathSelection_diff_TH; if (priv->CustomerID == RT_CID_819x_Netcore) DM_RxPathSelTable.cck_method = CCK_Rx_Version_2; else DM_RxPathSelTable.cck_method = CCK_Rx_Version_1; - DM_RxPathSelTable.disabledRF = 0; + DM_RxPathSelTable.disabled_rf = 0; for (i = 0; i < 4; i++) { DM_RxPathSelTable.rf_rssi[i] = 50; DM_RxPathSelTable.cck_pwdb_sta[i] = -64; @@ -1771,12 +1771,12 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev) return; if (!cck_Rx_Path_initialized) { - DM_RxPathSelTable.cck_Rx_path = (rtl92e_readb(dev, 0xa07)&0xf); + DM_RxPathSelTable.cck_rx_path = (rtl92e_readb(dev, 0xa07)&0xf); cck_Rx_Path_initialized = 1; } - DM_RxPathSelTable.disabledRF = 0xf; - DM_RxPathSelTable.disabledRF &= ~(rtl92e_readb(dev, 0xc04)); + DM_RxPathSelTable.disabled_rf = 0xf; + DM_RxPathSelTable.disabled_rf &= ~(rtl92e_readb(dev, 0xc04)); if (priv->rtllib->mode == WIRELESS_MODE_B) DM_RxPathSelTable.cck_method = CCK_Rx_Version_2; @@ -1923,15 +1923,15 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev) } if (update_cck_rx_path) { - DM_RxPathSelTable.cck_Rx_path = (cck_default_Rx<<2) | + DM_RxPathSelTable.cck_rx_path = (cck_default_Rx<<2) | (cck_optional_Rx); rtl92e_set_bb_reg(dev, rCCK0_AFESetting, 0x0f000000, - DM_RxPathSelTable.cck_Rx_path); + DM_RxPathSelTable.cck_rx_path); } - if (DM_RxPathSelTable.disabledRF) { + if (DM_RxPathSelTable.disabled_rf) { for (i = 0; i < 4; i++) { - if ((DM_RxPathSelTable.disabledRF>>i) & 0x1) { + if ((DM_RxPathSelTable.disabled_rf>>i) & 0x1) { if (tmp_max_rssi >= DM_RxPathSelTable.rf_enable_rssi_th[i]) { rtl92e_set_bb_reg(dev, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h index 1d4d7d98a859..5f210eb375fd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -130,13 +130,13 @@ enum dm_dig_cs_ratio { }; struct drx_path_sel { - u8 Enable; + u8 enable; u8 cck_method; - u8 cck_Rx_path; + u8 cck_rx_path; u8 SS_TH_low; u8 diff_TH; - u8 disabledRF; + u8 disabled_rf; u8 reserved; u8 rf_rssi[4];