From patchwork Sun Jan 29 14:57:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773455wrn; Sun, 29 Jan 2023 06:59:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXs+u2KM+I8DIpZ1mUj6tarEfZU4i5XkoHni0UB+xN5QZGtUoEUezz1YF5vqyX3jxO6MMiyE X-Received: by 2002:a17:907:7f14:b0:84d:3e5b:7c02 with SMTP id qf20-20020a1709077f1400b0084d3e5b7c02mr58561238ejc.22.1675004371926; Sun, 29 Jan 2023 06:59:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004371; cv=none; d=google.com; s=arc-20160816; b=toIjtgQsS30oPGrU8pL8ctjZUSzyGjVMVaYfwbfXBT9H2nI5CwtwkY51OxI8rqWXpi WeqDAO5YEF77kxm4bbAhWe0s8KyPN1sNIqI3IqMhfcKwwAN4iUpbwpfSFXcBQGWKhttI C2kjfMmrcwapM6lL4PYAoJniUiJX0UAsmpO3sJy9o3tAGZUwtTlMqWp/zr4hQpdYtODU aK8FOjvBDX3Ihyh0FRjg5B1dxm3UUOQLEiEhWDdWXZaLDRQYYGV/4dPfZOBt02uHruuu M9ym1V05YTyNSLhNXD3ay9Lc9vHl0Mjrjz58hf3QM61uXr/ZI9OdrIF9/BsgLAizl2XX UTVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=+df5OLdhGJNxUJkjXVUmf/v5B3qBNneBJngUv8WOJr8=; b=Y19rCHjKNDCaxkEjbU2MOLmyM9iMoYDpDGJmc8Zn4fkOpJ3qKiY07SNYAqRHbynh/d i/xddYO6OH9ry7H+PAxB0idUNemBGxRgh5fM1Zctpv+XG/qMgRvPvviNxG1QoEaO07F/ 0/08l/lA7DNV2Tx2eNOCkC6CDCwp1z+hGywPuKjOvFWuU+owYJhGkGVpfqLc4pgZcHZY hzQlaOTr0J6vJ32zvCjeNVaSpyRmvE0MRNM3AZHYSXOrU+PL4hC5QKyRJW2npt42O3fs 1G0HAUaMXuNA2O3dsjSMg2raGucPB3y8OvAX2DjRE68dJZJ4mNAeYi5at0rscbuIrxTw aYHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=WLo3w9Ah; 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 fv34-20020a17090750a200b0087777979e5esi11095796ejc.808.2023.01.29.06.59.08; Sun, 29 Jan 2023 06:59:31 -0800 (PST) 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=WLo3w9Ah; 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 S231139AbjA2O6H (ORCPT + 99 others); Sun, 29 Jan 2023 09:58:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231172AbjA2O6F (ORCPT ); Sun, 29 Jan 2023 09:58:05 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E9B14233 for ; Sun, 29 Jan 2023 06:58:03 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id bk16so8902771wrb.11 for ; Sun, 29 Jan 2023 06:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+df5OLdhGJNxUJkjXVUmf/v5B3qBNneBJngUv8WOJr8=; b=WLo3w9AhmuuylxJBA4KSK0zT8UWMDBe3iAEYktZ9g5qIOEvY3P8LaHT0fjDAi+5SvN yf29jLZHKOwsHh3Yi1NaMWayOSChKwRFhSVgEsZ/RQQ9RANRbzTAM22Ztkrv/V/BJUZG VsCLglkm02HyhX8m47GpEMPJhfeqv1Dlt3zzRwtiCt5Tgb50ePx1OY3ZmoGqNKk43tDv m4AW4Sx8xGyNRPYScUnmJHWHzwMchmsDrHk7stVWkb2U/MqaQEneTvkP2MPmCl4Y1iC6 OtexSC3HRqgxMjGS89+LKp0f0DDX82AIdfsiY/7XhRYHY2hyVAhjEliDxBmQd/+mM3R0 D5aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+df5OLdhGJNxUJkjXVUmf/v5B3qBNneBJngUv8WOJr8=; b=KJ4UmmG6iV6is6OjXDym5gv7y3LtK1+ZTcWfL0zMcDX/u5A/CkJJ3zxri17t3C7ueW EC+HklEMmjf8FnBWI4Q5tp5C+Yu0oSNOdQamte0dHUTv37mjL8V6i2qhyA/WOtiwbXBd LH5XCeOS8dFyqw2LDxyx1fPg6WrbItwIHDDEbCJiJlcb9bfpapVNhWPBMsaQTDaoCS1l SQlcJqKijyHOZvca3WkYJigXyTtRWPAualZF5R0jz48EuvmgukRM3mn22vXqWseAgL8y OEysUPY8EV04b+eHFG4obGzDFRblXQIF/1cWuDQCfQ0lV3/I7RDgr8tTV9LD8JgGDubX Hphg== X-Gm-Message-State: AO0yUKVA7WZbrcj7PwL+tLFZJnPdEY+islD/gVcViLz0krM458C13tIZ zP/oiZk6+RJEQjBY4eUnQFg= X-Received: by 2002:adf:db03:0:b0:2bf:d3e1:b0d4 with SMTP id s3-20020adfdb03000000b002bfd3e1b0d4mr1389303wri.0.1675004281964; Sun, 29 Jan 2023 06:58:01 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id hu18-20020a05600ca29200b003dc4b4dea31sm4696338wmb.27.2023.01.29.06.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:01 -0800 (PST) Date: Sun, 29 Jan 2023 15:57:59 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Rename TxBBGainTab.., CCKTxBBGainTab.. and RT_CID_81.. Message-ID: <0f390222d1bd272c3e63d1b2936109ac50e9f05f.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369384173766207?= X-GMAIL-MSGID: =?utf-8?q?1756369384173766207?= Rename constant TxBBGainTableLength to TX_BB_GAIN_TABLE_LEN, CCKTxBBGainTableLength to CCK_TX_BB_GAIN_TABLE_LEN and RT_CID_819x_Netcore to RT_CID_819X_NETCORE to avoid CamelCase which is not accepted by checkpatch. Added spaces before and after "-" to fix checkpatch message. Signed-off-by: Philipp Hortmann --- .../rtl8192e/rtl8192e/r8190P_rtl8256.c | 2 +- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 ++-- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 30 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 ++-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c index 9ea281808128..73a86e1d0701 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -151,7 +151,7 @@ void rtl92e_set_cck_tx_power(struct net_device *dev, u8 powerlevel) TxAGC = powerlevel; if (priv->dynamic_tx_low_pwr) { - if (priv->customer_id == RT_CID_819x_Netcore) + if (priv->customer_id == RT_CID_819X_NETCORE) TxAGC = 0x22; else TxAGC += priv->cck_pwr_enl; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 3989d484cc33..7ed3d47964af 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -460,7 +460,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->customer_id = RT_CID_819x_RUNTOP; break; case EEPROM_CID_NetCore: - priv->customer_id = RT_CID_819x_Netcore; + priv->customer_id = RT_CID_819X_NETCORE; break; case EEPROM_CID_TOSHIBA: priv->customer_id = RT_CID_TOSHIBA; @@ -741,7 +741,7 @@ bool rtl92e_start_adapter(struct net_device *dev) bMaskDWord); rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); - for (i = 0; i < TxBBGainTableLength; i++) { + for (i = 0; i < TX_BB_GAIN_TABLE_LEN; i++) { if (tmpRegA == dm_tx_bb_gain[i]) { priv->rfa_txpowertrackingindex = i; priv->rfa_txpowertrackingindex_real = i; @@ -754,7 +754,7 @@ bool rtl92e_start_adapter(struct net_device *dev) TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2); - for (i = 0; i < CCKTxBBGainTableLength; i++) { + for (i = 0; i < CCK_TX_BB_GAIN_TABLE_LEN; i++) { if (TempCCk == dm_cck_tx_bb_gain[i][0]) { priv->cck_present_attn_20m_def = i; break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index ca10a14c63b4..456b7ca73073 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -991,9 +991,9 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev) priv->cck_present_attn_diff; if (priv->cck_present_attn > - (CCKTxBBGainTableLength-1)) + (CCK_TX_BB_GAIN_TABLE_LEN - 1)) priv->cck_present_attn = - CCKTxBBGainTableLength-1; + CCK_TX_BB_GAIN_TABLE_LEN - 1; if (priv->cck_present_attn < 0) priv->cck_present_attn = 0; @@ -1016,9 +1016,9 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev) priv->cck_present_attn_diff; if (priv->cck_present_attn > - (CCKTxBBGainTableLength - 1)) + (CCK_TX_BB_GAIN_TABLE_LEN - 1)) priv->cck_present_attn = - CCKTxBBGainTableLength-1; + CCK_TX_BB_GAIN_TABLE_LEN - 1; if (priv->cck_present_attn < 0) priv->cck_present_attn = 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 4cf776094ac0..1287580ce352 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -90,8 +90,8 @@ #define PHY_RSSI_SLID_WIN_MAX 100 -#define TxBBGainTableLength 37 -#define CCKTxBBGainTableLength 23 +#define TX_BB_GAIN_TABLE_LEN 37 +#define CCK_TX_BB_GAIN_TABLE_LEN 23 #define CHANNEL_PLAN_LEN 10 #define sCrcLng 4 @@ -154,7 +154,7 @@ enum rt_customer_id { RT_CID_819x_RUNTOP = 7, RT_CID_819x_Senao = 8, RT_CID_TOSHIBA = 9, - RT_CID_819x_Netcore = 10, + RT_CID_819X_NETCORE = 10, RT_CID_Nettronix = 11, RT_CID_DLINK = 12, RT_CID_PRONET = 13, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 79f993ab7cee..5d77baf7df64 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -46,7 +46,7 @@ static u32 edca_setting_UL[HT_IOT_PEER_MAX] = { 0x5e4332 }; -const u32 dm_tx_bb_gain[TxBBGainTableLength] = { +const u32 dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN] = { 0x7f8001fe, /* 12 dB */ 0x788001e2, /* 11 dB */ 0x71c001c7, @@ -86,7 +86,7 @@ const u32 dm_tx_bb_gain[TxBBGainTableLength] = { 0x10000040, /* -24 dB */ }; -const u8 dm_cck_tx_bb_gain[CCKTxBBGainTableLength][8] = { +const u8 dm_cck_tx_bb_gain[CCK_TX_BB_GAIN_TABLE_LEN][8] = { {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04}, {0x33, 0x32, 0x2b, 0x23, 0x1a, 0x11, 0x08, 0x04}, {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, @@ -112,7 +112,7 @@ const u8 dm_cck_tx_bb_gain[CCKTxBBGainTableLength][8] = { {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01} }; -const u8 dm_cck_tx_bb_gain_ch14[CCKTxBBGainTableLength][8] = { +const u8 dm_cck_tx_bb_gain_ch14[CCK_TX_BB_GAIN_TABLE_LEN][8] = { {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00}, {0x33, 0x32, 0x2b, 0x19, 0x00, 0x00, 0x00, 0x00}, {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, @@ -290,7 +290,7 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) pra->low_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M; pra->low_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M; - if (priv->customer_id == RT_CID_819x_Netcore) + if (priv->customer_id == RT_CID_819X_NETCORE) pra->ping_rssi_enable = 1; else pra->ping_rssi_enable = 0; @@ -568,8 +568,8 @@ static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev, struct r8192_priv *p = rtllib_priv(dev); if (RF_Type == RF_2T4R) { - if ((p->rfa_txpowertrackingindex < TxBBGainTableLength - 1) && - (p->rfc_txpowertrackingindex < TxBBGainTableLength - 1)) { + if ((p->rfa_txpowertrackingindex < TX_BB_GAIN_TABLE_LEN - 1) && + (p->rfc_txpowertrackingindex < TX_BB_GAIN_TABLE_LEN - 1)) { p->rfa_txpowertrackingindex++; p->rfa_txpowertrackingindex_real++; rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, @@ -583,13 +583,13 @@ static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev, } else { rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, - dm_tx_bb_gain[TxBBGainTableLength - 1]); + dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]); rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, - dm_tx_bb_gain[TxBBGainTableLength - 1]); + dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]); } } else { - if (p->rfa_txpowertrackingindex < (TxBBGainTableLength - 1)) { + if (p->rfa_txpowertrackingindex < (TX_BB_GAIN_TABLE_LEN - 1)) { p->rfa_txpowertrackingindex++; p->rfa_txpowertrackingindex_real++; rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, @@ -598,7 +598,7 @@ static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev, } else { rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, - dm_tx_bb_gain[TxBBGainTableLength - 1]); + dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]); } } } @@ -722,13 +722,13 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) priv->cck_present_attn_40m_def + priv->cck_present_attn_diff; - if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) - priv->cck_present_attn = CCKTxBBGainTableLength-1; + if (priv->cck_present_attn > (CCK_TX_BB_GAIN_TABLE_LEN - 1)) + priv->cck_present_attn = CCK_TX_BB_GAIN_TABLE_LEN - 1; if (priv->cck_present_attn < 0) priv->cck_present_attn = 0; if (priv->cck_present_attn > -1 && - priv->cck_present_attn < CCKTxBBGainTableLength) { + priv->cck_present_attn < CCK_TX_BB_GAIN_TABLE_LEN) { if (priv->rtllib->current_network.channel == 14 && !priv->bcck_in_ch14) { priv->bcck_in_ch14 = true; @@ -1148,7 +1148,7 @@ static void _rtl92e_dm_dig_init(struct net_device *dev) dm_digtable.rssi_val = 50; dm_digtable.backoff_val = DM_DIG_BACKOFF; dm_digtable.rx_gain_range_max = DM_DIG_MAX; - if (priv->customer_id == RT_CID_819x_Netcore) + if (priv->customer_id == RT_CID_819X_NETCORE) dm_digtable.rx_gain_range_min = DM_DIG_MIN_Netcore; else dm_digtable.rx_gain_range_min = DM_DIG_MIN; @@ -1734,7 +1734,7 @@ static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev) DM_RxPathSelTable.Enable = 1; DM_RxPathSelTable.SS_TH_low = RxPathSelection_SS_TH_low; DM_RxPathSelTable.diff_TH = RxPathSelection_diff_TH; - if (priv->customer_id == RT_CID_819x_Netcore) + if (priv->customer_id == RT_CID_819X_NETCORE) DM_RxPathSelTable.cck_method = CCK_Rx_Version_2; else DM_RxPathSelTable.cck_method = CCK_Rx_Version_1; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h index 65d077dfee37..7339ce1e40db 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -162,9 +162,9 @@ extern struct dig_t dm_digtable; extern struct drx_path_sel DM_RxPathSelTable; /* Pre-calculated gain tables */ -extern const u32 dm_tx_bb_gain[TxBBGainTableLength]; -extern const u8 dm_cck_tx_bb_gain[CCKTxBBGainTableLength][8]; -extern const u8 dm_cck_tx_bb_gain_ch14[CCKTxBBGainTableLength][8]; +extern const u32 dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN]; +extern const u8 dm_cck_tx_bb_gain[CCK_TX_BB_GAIN_TABLE_LEN][8]; +extern const u8 dm_cck_tx_bb_gain_ch14[CCK_TX_BB_GAIN_TABLE_LEN][8]; /* Maps table index to iq amplify gain (dB, 12 to -24dB) */ #define dm_tx_bb_gain_idx_to_amplify(idx) (-idx + 12) From patchwork Sun Jan 29 14:58:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773545wrn; Sun, 29 Jan 2023 06:59:49 -0800 (PST) X-Google-Smtp-Source: AK7set9K1/AdD8OGgFDuDiyecSPG3ZFgdwnpei1B++EXbQ2sboG+5Zee5pH188FFN35EkRwbWYaq X-Received: by 2002:a05:6402:550f:b0:49f:da00:47a5 with SMTP id fi15-20020a056402550f00b0049fda0047a5mr23268499edb.25.1675004389072; Sun, 29 Jan 2023 06:59:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004389; cv=none; d=google.com; s=arc-20160816; b=tQjMkVuBksyUpewuYjQ9nIa6qT5nohFvwaLj5o0R3RjI3G2OtMLXLCgDlKxE+SYxVB KuICYjA4PurhbO3rIgXci5dPmpO03r0nDYBpEpx5Wf0JxBcsaUMqQwKpA/2XyJqVMwSQ dXui/KT+YhiwyS/blPYoUqJxTFi+OOxszkIAC27zd8NKHrJzJeUwv8F6H1QjXCiADX/b 75E36LdGaoP2q5eWq28X+BhWQtNIKMpIO9BvuvXUiJP0+Muh672UbtJ5Z9yDHrrnndyS xH3ZYEaFQeA27y2inx4E5+ocOodg8M48U9wgcUOTdeAHOmsaQy+QETY8IcWFdqpy1XAi Q6cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=eapJfMMbUhQoPbQcq0LW4vCgN/iDDA+h2+m4Hvg5O/Y=; b=vMX8OlJT4f9Xw3kG89D61yGyafYDsnfzGdxmlVMmaS6J4GKJObwuMVyzAWvrqXV4uR jQujWO0SeCJpPIRZ+pOjiXSjhHfeeIhoqyLUr5r/hyk8q8pZMvEuAFfFY3l4S+805FNz kWZY4ZXpCnaQwEwzmc6JLUcZlFvRw9Fz+ZFyMmx3woBLKdRFKTdHfdVTlVRIZoYcnwr8 R78NfFrVv8pmTwB7wv/jS6TCtCOAmbOz3AM6q/bu02ltMcRTLfEzDPOF0FYSF9SMduzA yFR8ty7DRy8M6oSCk0vJ3GxUMMfoMqQ4KzmofeQ5T40wMbFUJzJhg3jIdX7JG3Kr/OW9 A//w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fx+TJN5X; 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 u26-20020aa7d0da000000b004764be0b8f8si11892482edo.424.2023.01.29.06.59.25; Sun, 29 Jan 2023 06:59:49 -0800 (PST) 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=fx+TJN5X; 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 S230073AbjA2O6S (ORCPT + 99 others); Sun, 29 Jan 2023 09:58:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234449AbjA2O6Q (ORCPT ); Sun, 29 Jan 2023 09:58:16 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34FEC144B3 for ; Sun, 29 Jan 2023 06:58:11 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id a3so2224651wrt.6 for ; Sun, 29 Jan 2023 06:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=eapJfMMbUhQoPbQcq0LW4vCgN/iDDA+h2+m4Hvg5O/Y=; b=fx+TJN5XiMVDaM3DMm20nAVT5wQtftfj59wz16DPm623dJIwBFth2yo0LN+3qGDA8B 7Lgg6yiYSumyjaD/C8CjzKciUEm7GoEbkGYt1c2TjPLJCFha9+77PjsrXUz1D/tF17ul QBLD6f8eRRfQkerRYy93RViV9k1h7m7jXU6QGALXpVufPMbV2Y/tizdzaEFzIoMqDfEJ rYl3xMJYNM03j05q5O79yI6C8+ucrduFF7K9tPAQj/2pgKmrIPKe/3s3UiYkXVb1HVmy /IAGXfaNkb8tqGaG/breTC5zAkeFOb1hSzxkdfQFBMkk86Q6Hz6jSZETeL2slHO74FvG Paag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eapJfMMbUhQoPbQcq0LW4vCgN/iDDA+h2+m4Hvg5O/Y=; b=x1jJSo/AZtYj1+RC0aHST3SAzR4+n3eKw9Kn+J2vFvslSSEZQ6Wfu/8JaPk6Vwz0eI /5mDK2poV0jSdPX6vAbNCXJy7d6mMVgJxuhRCsDGJV8V/43lufkj3cvbb6a9whJNXBMK wnadI1HhJApGfgqXQkZie4Q9Z1s4q2hv74co5I82wexhfA0m9Wp1GQbE5awxbam0lL8Y k8il8P0Ex6hUh/yVCeeCicdf9uEyCxMImCVUNhoF8PMWE9KDodTw6Yx1D3QmnGJkGvx+ a1RNFQ2xItAVQEkpR9qqSVYWZ5Y6cmmnPgsb1JlMY5KhR9ZFWGeTzIWTeLYTkaBDc42u 7+7w== X-Gm-Message-State: AO0yUKWuRrkED7Wvgyg+hS+eKFJ+Uul37GayNf3cnKUesyQA5+cicmHN I1ArrI1EnxcDBiUpBMOniC0= X-Received: by 2002:adf:e6c1:0:b0:2bf:d333:2194 with SMTP id y1-20020adfe6c1000000b002bfd3332194mr1444001wrm.3.1675004289697; Sun, 29 Jan 2023 06:58:09 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id v2-20020adfe282000000b002bdec340a1csm9240032wri.110.2023.01.29.06.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:09 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:07 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Rename sCrcLng Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369402058397018?= X-GMAIL-MSGID: =?utf-8?q?1756369402058397018?= Rename constant sCrcLng to S_CRC_LEN to avoid CamelCase which is not accepted by checkpatch. Use S_CRC_LEN instead of fix value with comment to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 7ed3d47964af..912b50d3fb31 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1827,7 +1827,7 @@ bool rtl92e_get_rx_stats(struct net_device *dev, struct rtllib_rx_stats *stats, stats->RxIs40MHzPacket = pDrvInfo->BW; _rtl92e_translate_rx_signal_stats(dev, skb, stats, pdesc, pDrvInfo); - skb_trim(skb, skb->len - 4/*sCrcLng*/); + skb_trim(skb, skb->len - S_CRC_LEN); stats->packetlength = stats->Length-4; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index f8a8ece40ac1..26cf4b5165f5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1906,7 +1906,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) skb_put(skb, pdesc->Length); skb_reserve(skb, stats.RxDrvInfoSize + stats.RxBufShift); - skb_trim(skb, skb->len - 4/*sCrcLng*/); + skb_trim(skb, skb->len - S_CRC_LEN); rtllib_hdr = (struct rtllib_hdr_1addr *)skb->data; if (!is_multicast_ether_addr(rtllib_hdr->addr1)) { /* unicast packet */ diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 1287580ce352..a5812dfcd614 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -94,7 +94,7 @@ #define CCK_TX_BB_GAIN_TABLE_LEN 23 #define CHANNEL_PLAN_LEN 10 -#define sCrcLng 4 +#define S_CRC_LEN 4 #define NIC_SEND_HANG_THRESHOLD_NORMAL 4 #define NIC_SEND_HANG_THRESHOLD_POWERSAVE 8 From patchwork Sun Jan 29 14:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773626wrn; Sun, 29 Jan 2023 07:00:01 -0800 (PST) X-Google-Smtp-Source: AK7set/TuxRKNBjZSXllZjICVbAXWCBh22CweXSMJe8POAaCB4o6k99zyQEUURKq38YWXxpi8CLU X-Received: by 2002:aa7:df9a:0:b0:4a2:1737:55a9 with SMTP id b26-20020aa7df9a000000b004a2173755a9mr9203952edy.9.1675004401749; Sun, 29 Jan 2023 07:00:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004401; cv=none; d=google.com; s=arc-20160816; b=jBudOPtu37PiBfqSJQ7PitUMJzxmtLRRWvsDzBD1qMH2q1xSmeDb/v9iQEg2O9sGw4 0+cFfQNfJJqUCl1sFI4mMHsezueBx2D7OdxG90rNuMJlET7e3GSXVRqYElaQ3RsaD8d1 YtrK8Jr3ZyH7ZMyJFTKUW++8rnrmhzOeDY6P8t8V7pgg01xZU0n9yVsss5MYzq1lCgoX /yF64fgzu/hXmvM1xYfQNTpR1FetvqC8FG80ChOfoj4E/goeCfhmoqRgY1OQlCs+NITk MXqIs/7TYdc89dSOh0IxdBswsl5PsCSRPZtPAmnhKsilD+9Xxbdi3YmLBFOdr4nQd4Qk K9kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=j/arEtqUO8wfxYSvaFNgKnF+/02YVjkPsJ1e9Hg8Qsg=; b=pKqm9LT2FNTIEkSZIvzc4CFEkPB0uV9FLayjs82Wu/x2Hdxe8/B1HbHp60ZNjkRnPJ B3nqwMAdaybuc6JumkY5zkgzVEQIi9VVdBecBIrgCZUSremUTy/L1WOTRLPi+jvPw55l AEjr4R21vS6FGiM1SfwzB1O5lsqLeUuIXRMKfR/FcfhVW/+i/2jWDFEkRlBZFi9a13OX 36HTleMmEol7QzMKLyt5Tj1LeinaMQDhIdmvqdlFuhsDmkW0T+jaUDedhnhPjT7T4Uco hOdrL8PcanH8/NVx6QdjkKBVjWhPIUYpbujLEX+XnvU263uAIxs7+cZCBke1Xa5ykncJ uqYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="EiY0/vod"; 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 v1-20020a056402184100b004a21263b3f0si7748987edy.615.2023.01.29.06.59.37; Sun, 29 Jan 2023 07:00:01 -0800 (PST) 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="EiY0/vod"; 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 S235041AbjA2O6m (ORCPT + 99 others); Sun, 29 Jan 2023 09:58:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbjA2O6e (ORCPT ); Sun, 29 Jan 2023 09:58:34 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39EF912F01 for ; Sun, 29 Jan 2023 06:58:18 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id iv8-20020a05600c548800b003db04a0a46bso7655708wmb.0 for ; Sun, 29 Jan 2023 06:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=j/arEtqUO8wfxYSvaFNgKnF+/02YVjkPsJ1e9Hg8Qsg=; b=EiY0/vodIfgdu0k3X2p3c/fRGFbQQ4ddYmIAItYE6pbBlmh5/azx5BOmwR9F6u9nVI 69o6dnT1mJAIwtbNcFch0+HKlrZAxiIbyb02lm+/AghgrX59nnt0a1wgPjriQe3so3EH qjtEKvh6orcP+LN5Dby1Os5jRwZzRJwPawTOfRUkWxYAjq2eEyJjRctgafa5LHFmiLSV tRCCzpQ0DdjpGQ1o2jRj8BIwSTgWdC4s7bMWW1eUzPrCA2gX/D2MCMhMHnX3SS7DRxQ1 xK32YcASzGRO8MiHf9AyYjSDADSxsVwn+Z4LWuOjyh3bPiJdKJbeoT+8DcpLQD7OtgWK YQ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=j/arEtqUO8wfxYSvaFNgKnF+/02YVjkPsJ1e9Hg8Qsg=; b=IYM7wI9c9sDYhLMVVo0Wmbc/pJtw43SdWuaIwfC3BYH9Fca6bY4cDd35MtwVmgHa5S KbEKAy5spsn9S6h2usfApZ/yolA+POmDVlfv8e0d5iHkX/KUFBFWBK3mLehD2Cozz4QV L+6jtKMl/utOctjqZzyUVnrsiucn/X9irYx5zv3vblMPcZjOAJZ2lHIIKC/W36QXEbgz V0wH1Wy81AQqf2cwKYi/+kr7I+8WGlS8ctlOzn7BFE1FlYkBfKSwxf9Rehv7b/1dzG0y YYVdwEO1XGGS+z+VMbmqqRn/m3iFlY9xQttNUl7bKp/FxD7oCgmM7qHpgBy7q4HZ4K6r uk7g== X-Gm-Message-State: AFqh2kq0CR4eHGO4poF9Y68NnFfx27VUy0Vi2pVd96Mi3iTX2Kvn3hPn 8h+w0418KxXhuBXzYuTMEtM= X-Received: by 2002:a05:600c:5120:b0:3db:21b8:5f53 with SMTP id o32-20020a05600c512000b003db21b85f53mr9978706wms.1.1675004296813; Sun, 29 Jan 2023 06:58:16 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id 19-20020a05600c26d300b003dc50c38921sm3173405wmv.35.2023.01.29.06.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:16 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:14 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove unused variable rxSNRdB Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369415541776007?= X-GMAIL-MSGID: =?utf-8?q?1756369415541776007?= rxSNRdB is initialized and set but never read. Remove dead code. Local variable rx_snrX is then of no use. Remove rx_snrX as well. Local variable tmp_rxsnr is then of no use. Remove tmp_rxsnr as well. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 9 ++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 912b50d3fb31..1677b6c5d363 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1297,9 +1297,9 @@ static void _rtl92e_query_rxphystatus( struct phy_sts_ofdm_819xpci *pofdm_buf; struct phy_sts_cck_819xpci *pcck_buf; u8 *prxpkt; - u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm; + u8 i, max_spatial_stream, tmp_rxevm; s8 rx_pwr[4], rx_pwr_all = 0; - s8 rx_snrX, rx_evmX; + s8 rx_evmX; u8 evm, pwdb_all; u32 RSSI, total_rssi = 0; u8 is_cck_rate = 0; @@ -1419,11 +1419,6 @@ static void _rtl92e_query_rxphystatus( rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i] & 0x3F) * 2) - 110; - tmp_rxsnr = pofdm_buf->rxsnr_X[i]; - rx_snrX = (s8)(tmp_rxsnr); - rx_snrX /= 2; - priv->stats.rxSNRdB[i] = (long)rx_snrX; - RSSI = rtl92e_rx_db_to_percent(rx_pwr[i]); if (priv->brfpath_rxenable[i]) total_rssi += RSSI; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index a5812dfcd614..d0c88d68b60b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -197,7 +197,6 @@ struct rt_stats { long recv_signal_power; u8 rx_rssi_percentage[4]; u8 rx_evm_percentage[2]; - long rxSNRdB[4]; u32 slide_beacon_pwdb[100]; u32 slide_beacon_total; u32 CurrentShowTxate; From patchwork Sun Jan 29 14:58:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773636wrn; Sun, 29 Jan 2023 07:00:02 -0800 (PST) X-Google-Smtp-Source: AK7set9FYfC4Z8A5RBcby/AJC9NzgQWgiinKFBOAEYn68Jm3qw4RqZGbQaM65CAbFXPzscbdKVXS X-Received: by 2002:a17:906:5384:b0:87d:f32b:40fd with SMTP id g4-20020a170906538400b0087df32b40fdmr7128041ejo.39.1675004402599; Sun, 29 Jan 2023 07:00:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004402; cv=none; d=google.com; s=arc-20160816; b=u/KSO5xFxqFlQqv+tLAh3NstBv6Zhj6OlelgJrhB8nCZWAfCkhWEPPjYxkd6rwgpY+ Myd7ETy7Wo3bBHMMY+/5x25hFMTC4gUA8DXnZKZU8WGOrOX8ah3UBs4pPuz9EVX9mCCF 7JyRSZASzSyf0JwvbRtRazc775YGwjL9tww3h/rdVUf7fhDLNyUb4H88qmBamq0M//GI 9mt4Xq3qyOWNznU1vrR0R5RO1nbAvD7Ce9EI3MjG1PhqvmB370XfSZcA4DIuxTcmcfyY HmVxztP2zXKYm13hwvbtS/Pt8D/pMvEHA+O39ubzfZPP4CHor7/0yRiQY3PfOxyf/6tV WVQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=WMDHyvlfs7O/f9b0aUY8Mk44RRiJoj0uuEZqCuWERA0=; b=YrVsl/3BqD0A2w2ZE0fhWYftnN/8F5/TYTcApqR0PjI//mohnU6QoJi6xEugcwCDs5 drZB2QAqbSHg4umnfybjN3vE+LLvvWLRZLNowMOzW94gL6WXeA/dcwL0t+Qm3ZmU7KUg 7s65feOZJuP/Q57bN4IDRjf/8QmMDpd5/FJXmeO3Rk7ZWMNN25CRzGqa0zcZ4HB6f514 ooPn4fpCfIYyTWj/nvjJnG/UQZMhvqg3nDv8/velEX/umjC0HrJAyrZPOu6F0IH8hbGg EmA0dZ1HMhrAqqBaLk0OJgM4bMa6mMaISCB8Rtjxw8eqHCYoJyxfuBXDi5oKhN1B5toX nb9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=U8qeYGmL; 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 ms15-20020a170907620f00b0087bca83172asi8707364ejc.320.2023.01.29.06.59.39; Sun, 29 Jan 2023 07:00:02 -0800 (PST) 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=U8qeYGmL; 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 S234930AbjA2O6q (ORCPT + 99 others); Sun, 29 Jan 2023 09:58:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235033AbjA2O6l (ORCPT ); Sun, 29 Jan 2023 09:58:41 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C01F18AA9 for ; Sun, 29 Jan 2023 06:58:24 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id m5-20020a05600c4f4500b003db03b2559eso6527365wmq.5 for ; Sun, 29 Jan 2023 06:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=WMDHyvlfs7O/f9b0aUY8Mk44RRiJoj0uuEZqCuWERA0=; b=U8qeYGmLBlCJYcOTVLISYohR2qxsDZ1bIGwMgo+ozYZisTCvdpTSOb+t/WMHoRR1xR CIu0lhxN1GyLL7Adix2Na+kt1XMA9UWCiplJwRRzK1eHOw4SDJZxltOzFu7nwTMF8JDg U/nY34BrQ9N4EQKCWyd0xYNUGK4DOoY2Mu0jwnROimBUWeGtEbde4p8e0RWkeSADfiOL j6ve/Q1cwndyr/rS3VI5Qe5GWqY31T0es+MlK2mTSsDjoGuqu4tNTsh8H9DnHWuUhaaL 7FkJQyxSuTJUfTQFnrmcoPHlsQW2o78Od9icSoPJG6H7aMKfJcsUw6P8ydjUOAHmKfYK W+lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WMDHyvlfs7O/f9b0aUY8Mk44RRiJoj0uuEZqCuWERA0=; b=UbVCqNb4fBN7TnNqJKJEo1HurgQJx7/suI9TCYHYFIyAg8+VFzyn2Wz7ln2Op81KBs He4CTEiHvp59xDPlg/BUKk7bYDZ/wCoL0UWJzLQRWYmPT9R8BTYmsccsYmZUtmyPyEDO rhNZ992uuhBn0o2COY8ecZFZfQtsqT4BTyMZSWp7NMvbNvow7zK/YJMn6lKjivIdNNkK WoAAuhnoCZY0BZpZLYWBqUjiiFiTzx0FfeYqfiIZ/HNxSDC+rg9IMFgRhrUi0m7cxX1A uQhlt7RguNAxhSlxWvXE1LZXUN5LFPSxIxPBoksFLjNyZEIPt8SJBspOzWal+PhiNNHC xcew== X-Gm-Message-State: AFqh2krPM1F7TRScJ82j1ZyfNObaxJBC0PzZxHguO8dy+AJfl07btaiu a3KR4B5aNRX94nQfmb978uaWcKhgqmw= X-Received: by 2002:a05:600c:3b85:b0:3db:35e3:baf6 with SMTP id n5-20020a05600c3b8500b003db35e3baf6mr8664147wms.4.1675004303614; Sun, 29 Jan 2023 06:58:23 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id f7-20020a05600c44c700b003d995a704fdsm10008658wmo.33.2023.01.29.06.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:23 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:21 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Remove unused constants from enum rt_customer_id Message-ID: <108d80f0ae1006b716205dce0ca9a7ee597ba1dd.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369416141106419?= X-GMAIL-MSGID: =?utf-8?q?1756369416141106419?= Remove unused constants from enum rt_customer_id. A part of the constants would need to be renamed because of CamelCase. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 22 -------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index d0c88d68b60b..17fc69c839d3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -145,35 +145,13 @@ enum rt_rf_type_819xu { enum rt_customer_id { RT_CID_DEFAULT = 0, - RT_CID_8187_ALPHA0 = 1, - RT_CID_8187_SERCOMM_PS = 2, - RT_CID_8187_HW_LED = 3, - RT_CID_8187_NETGEAR = 4, - RT_CID_WHQL = 5, RT_CID_819x_CAMEO = 6, RT_CID_819x_RUNTOP = 7, - RT_CID_819x_Senao = 8, RT_CID_TOSHIBA = 9, RT_CID_819X_NETCORE = 10, RT_CID_Nettronix = 11, RT_CID_DLINK = 12, RT_CID_PRONET = 13, - RT_CID_COREGA = 14, - RT_CID_819x_ALPHA = 15, - RT_CID_819x_Sitecom = 16, - RT_CID_CCX = 17, - RT_CID_819x_Lenovo = 18, - RT_CID_819x_QMI = 19, - RT_CID_819x_Edimax_Belkin = 20, - RT_CID_819x_Sercomm_Belkin = 21, - RT_CID_819x_CAMEO1 = 22, - RT_CID_819x_MSI = 23, - RT_CID_819x_Acer = 24, - RT_CID_819x_HP = 27, - RT_CID_819x_CLEVO = 28, - RT_CID_819x_Arcadyan_Belkin = 29, - RT_CID_819x_SAMSUNG = 30, - RT_CID_819x_WNC_COREGA = 31, }; enum reset_type { From patchwork Sun Jan 29 14:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773701wrn; Sun, 29 Jan 2023 07:00:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXt6Hpcufc4ZvienatSr+KrtvoIbOh4OahN8R4IXCUmWApXjnEjdpCMGKDknYiK83/nohvdU X-Received: by 2002:a17:907:874e:b0:872:27cb:9430 with SMTP id qo14-20020a170907874e00b0087227cb9430mr55603705ejc.74.1675004411778; Sun, 29 Jan 2023 07:00:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004411; cv=none; d=google.com; s=arc-20160816; b=gcsIFAC4mKH/rqpsF0OOPhvgDOzKQVEd8D7Zh76I3ggvwfx1SRaJJ1/KRLWTZ2Lkyt cF67PX1T/f7ID+vdYnobmEDMOlZQu1nmNqH5F8Aik0lvh5d3Jj6aXzFd0JF28xWT6YK1 oUhRMi8wC/BgPiH2y9FpqVHVBfuZaTuoS7Amtg0tV0aXFDlgAR4OREgQbrVRyFTlY/WP KtAmGJw0ER2BscSnmq7te6dyI4BnEhcgbDUE9kOmypqhiEHH+ZhJDjyeRRiJ327PQUxx s3viqahUEnrf4jVLhh+7Nld6QNVC3C7/i/S/HlxKRSI/3FWadEJ/lb16vB+FFsLvSjDF 2hXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=9kObtkesHDp3/jvTg21bOv7yEj2AdVjYtEj97EYzt4U=; b=fw8Xq8ve92/BzVc68IKdo76b8DjL89hKYwu0ty73F+1Ud7wBUciKK8VqoH1Lm0B7QG W+Tsdj4r+nTnlvLvDbnSSA+j8KH16y8vUg3dSyuvXpx3AFZhV/HjKYpR9H9J5bc3MsCy a2JC3FkOEOrTxkNJiHTwuqh1PjNvd09fuSgnHOEZgmrwZiaRkZeASkHx1J3xgkdlo7Hf GezeCHIOimDHLmiYIpyroG7oiG0Hh4qkhKnzzJ1f4sphr8Jg8LbGnhsf30K0wOI3wq/2 asFdwzEIB15ff8M4PImsCXT/+XSxhESUm8SN1Ck6BWcWodiKR4RknCPBGJOKiH5lUsQW FXiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nn0+dCEG; 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 vg13-20020a170907d30d00b00870dfbd036csi12848795ejc.653.2023.01.29.06.59.47; Sun, 29 Jan 2023 07:00:11 -0800 (PST) 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=nn0+dCEG; 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 S231387AbjA2O64 (ORCPT + 99 others); Sun, 29 Jan 2023 09:58:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbjA2O6y (ORCPT ); Sun, 29 Jan 2023 09:58:54 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66ECD13D73 for ; Sun, 29 Jan 2023 06:58:32 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id bk16so8903320wrb.11 for ; Sun, 29 Jan 2023 06:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9kObtkesHDp3/jvTg21bOv7yEj2AdVjYtEj97EYzt4U=; b=nn0+dCEGm10fKkUm78VcoLjWaZpJwjB4bHUDywbWtUJCDHsf9ZMfrZn7txLxgBs9Ya YdPXo9SQ+k8eD1CjU27DoAvh2/vmPaoFkA277Qc0y2rg4Ewzsvr5sOk/laThLk4gAxBk jym2s4C2NBr4aRrilPO8hRrkt7V3l0UnqccpY4lMoecjNiGraLBAa6+B3m955BcFiqAI QBJfndZQBZq96BZofLXKZR/poud2Issp72OvQYWgLBpwbaVfpPy2INosxL1JHX/qWDvA lVcEtre89LNAim+itY+jAsdDYWfFftOJXJN7h+Co+1BY2lk8LkhBvpawJ2jsaM+LLZgo 4NlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9kObtkesHDp3/jvTg21bOv7yEj2AdVjYtEj97EYzt4U=; b=pQWQLkduwJwDPDe/ogwWiTdtL7TcqZsBfE9jmRyx5fBvy9bTV+vm2niKR5GZBudhZk zc3iQtcimdvwouBkAQZ/IamkBSjSKLcu8hHfFU9xMxdOpEaWrRGgDsxCzD1w7kRYaFry 6KhdMs4lY+IedoMbmYj7dpLbJFs+fE3Sb4eKKqNd8CeRrTbro4jA4vxmTUHPHvh7twtx yNMBjQv8MF5qsjXeAoV+bxVrdgNc/DeftYUeOYDOaBrxoTjk9mxFxjB5ywVCfyrp+cWH HsTeE8GJMmwdZg61iwITiTotMNUPrRM+gvUjjLD7u33uyP8iHA/0rTh+Lmir23SA46/R 0sdg== X-Gm-Message-State: AO0yUKUuUTne0c4+w3S00pbtwzJND45ar80NKRtJrIyqPZiRQ7qMt0Kv gH6ODVFq7T+1jnfHSuNz9bQ= X-Received: by 2002:adf:ba4a:0:b0:2bf:dfd5:98c9 with SMTP id t10-20020adfba4a000000b002bfdfd598c9mr974249wrg.7.1675004312434; Sun, 29 Jan 2023 06:58:32 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id o4-20020a05600c2e0400b003dc4ecfc4d7sm3892938wmf.29.2023.01.29.06.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:31 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:30 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Rename BaseBand_Config_PHY_REG and BaseBand_Config_AGC_TAB Message-ID: <6d26690c7c2c68cc7c766c981293bd8e40999ed0.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369426214992518?= X-GMAIL-MSGID: =?utf-8?q?1756369426214992518?= Rename constants BaseBand_Config_PHY_REG to BB_CONFIG_PHY_REG and BaseBand_Config_AGC_TAB to BB_CONFIG_AGC_TAB to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 4 ++-- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 3e223151d4b7..858cfc203f13 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -8,8 +8,8 @@ #define R8180_HW enum baseband_config { - BaseBand_Config_PHY_REG = 0, - BaseBand_Config_AGC_TAB = 1, + BB_CONFIG_PHY_REG = 0, + BB_CONFIG_AGC_TAB = 1, }; #define RTL8187_REQT_READ 0xc0 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 456b7ca73073..cbda027656dc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -342,13 +342,13 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType) Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; } - if (ConfigType == BaseBand_Config_PHY_REG) { + if (ConfigType == BB_CONFIG_PHY_REG) { for (i = 0; i < PHY_REGArrayLen; i += 2) { rtl92e_set_bb_reg(dev, Rtl819XPHY_REGArray_Table[i], bMaskDWord, Rtl819XPHY_REGArray_Table[i+1]); } - } else if (ConfigType == BaseBand_Config_AGC_TAB) { + } else if (ConfigType == BB_CONFIG_AGC_TAB) { for (i = 0; i < AGCTAB_ArrayLen; i += 2) { rtl92e_set_bb_reg(dev, Rtl819XAGCTAB_Array_Table[i], bMaskDWord, @@ -526,12 +526,12 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) return rtStatus; } rtl92e_set_bb_reg(dev, rFPGA0_RFMOD, bCCKEn|bOFDMEn, 0x0); - _rtl92e_phy_config_bb(dev, BaseBand_Config_PHY_REG); + _rtl92e_phy_config_bb(dev, BB_CONFIG_PHY_REG); dwRegValue = rtl92e_readl(dev, CPU_GEN); rtl92e_writel(dev, CPU_GEN, (dwRegValue|CPU_GEN_BB_RST)); - _rtl92e_phy_config_bb(dev, BaseBand_Config_AGC_TAB); + _rtl92e_phy_config_bb(dev, BB_CONFIG_AGC_TAB); if (priv->ic_cut > VERSION_8190_BD) { if (priv->rf_type == RF_2T4R) From patchwork Sun Jan 29 14:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773762wrn; Sun, 29 Jan 2023 07:00:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOqkEJoGVdEj6RHerGqKHnkKVxWbemUDbdn68FCA+TtNVOYMeA0zMOncmp8BVSoEgDA89j X-Received: by 2002:a17:907:7f14:b0:84d:3e5b:7c02 with SMTP id qf20-20020a1709077f1400b0084d3e5b7c02mr58564481ejc.22.1675004419348; Sun, 29 Jan 2023 07:00:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004419; cv=none; d=google.com; s=arc-20160816; b=XG28eFR29ktvgffFpQ1J0N0Hi5YmnHOHYZ3kP7376/wbP/OYMqmk8THN1PCF1eouAg CJWAjHVySbmlpCwd8+tWRNAg7DRKb+p3gt87oyxbqsdB41ct+DCV7pFNK3qJSSoGMsoM e29wm2/IdKrwu6uRJ5Q3j8LKtVowTWr2T9fJEEDextIOnEpJvXY8MjXlyvMLTknkxwoZ SG762C/0ZEeOdKLiKxDGTVXoYINhoZxp/VOGMwaKNru6udxZ0JWikTW8MltmSWZhNtmJ EQpw4Zrj6lLJsDOKlnmB8ZTSTIvvaVW/5HARCrTX+MLCA9FWpgO75LWy6xl4YSTRKpND nIEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=MyvKP4txQ13hA3WgepX6K+C6nDjIWuymKszT6lxk42U=; b=qZwUn4CT5nEQtsMd/drohlBmXwQA+r/tzwBEXPZWbEIaBzyOE4PcG/yIsez/fFj4B0 mfz5BUQGLK14mS2vk1slNGFVNgXdbyc1lVRU3alDXyZVV+lcIREGX7WHMUqWY47PrK6T IG5jdkYVJBAxFFm4yf47ZuiGYUVH6oI+rErs93tNgXzfYFQJmz9/Be9Um389syn4OxZC T60VgL1+Gx0LbLuo+8jMZHwY3B39ehuKEBjxkGpWhSH3QYE1KZncuZg635ypDMqnSN4z xduKgHpzANtmBr2my1ocFtQ+tGB+f4QcuwRCwE9tCoBvMWothRdzyMQP84YiLjkDZ4XI QMTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SqTC1lH9; 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 mx11-20020a1709065a0b00b0087bdc5bc155si6352836ejc.909.2023.01.29.06.59.55; Sun, 29 Jan 2023 07:00:19 -0800 (PST) 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=SqTC1lH9; 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 S234670AbjA2O7D (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234573AbjA2O7B (ORCPT ); Sun, 29 Jan 2023 09:59:01 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80325F750 for ; Sun, 29 Jan 2023 06:58:40 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id q10-20020a1cf30a000000b003db0edfdb74so7468581wmq.1 for ; Sun, 29 Jan 2023 06:58:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MyvKP4txQ13hA3WgepX6K+C6nDjIWuymKszT6lxk42U=; b=SqTC1lH9c+quHuDgGjFZOwgvbXTCJGzGUtee6cQENP2LMMrrqgbzbMqwDWWPcXZiI+ 2LE2M+NFydezoE4SyPVKtdGQUaEvtDYgkm3/KWdGLgERRc25WA+LLrBjvko6qGwYacBS 6UpgSqicII3V5ehThNEZe5K97HD9NEiF5E+Z5ielQnsBjThnqiscfVoG7CWlwgKH67zB TtBGQa/8CPiBhkDgMBieJmNa+tHqwT4sojmHhkv5R0/Q1Vi4WpTFJv+sk+nh83MgHKxz Nv1IzhYJY+Vw59y5c0i6wbwOzamg0DdG0bjbsRFrU/VzQU2moIP1dLAUwbPm0TfaJCQs jMyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MyvKP4txQ13hA3WgepX6K+C6nDjIWuymKszT6lxk42U=; b=LEWOUbS0lfGEsO0m+S8M0hHahvFKLYAFI1fw6HSooW+wNleZEhp/vuNpJpzf2DlNlP NTz0zcrys5F/zFCeLwOrACiREmYjgC9DJ+s6bZm86Fm7sPAgBt9lh9a5PluRRM610lFB 92FsF2e+01vHsAfipPP+ce7iju16VieVs8Zdbd9M+3ec2dr7u1ba8drEXR4MsHNQqHjq qjZuwyFRLVMgpn6r/+YQa9U1Sf2VUSzsBXFV5BCxT8+Dd4/gNoeP/nwoPkOxpYsXETh1 40wbXu0pW6brRTXZtWN76D2ml0UjlDtt2FgadBdlCpjyD7Xw87Wv3E322zI2nxows+Kn ti9g== X-Gm-Message-State: AO0yUKX2xwMs5ZjK1fTBkKJndVp/RcBqCI5cTOAECuyCGvduNRNTk7+/ 88MN9lSFww3R8sDGi/lMiTQ= X-Received: by 2002:a05:600c:5008:b0:3dc:557f:6122 with SMTP id n8-20020a05600c500800b003dc557f6122mr386081wmr.1.1675004319099; Sun, 29 Jan 2023 06:58:39 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id w16-20020a05600c099000b003daf681d05dsm10048927wmp.26.2023.01.29.06.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:38 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:36 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Remove unused constants at beginning of r8192E_hw.h Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369434034146812?= X-GMAIL-MSGID: =?utf-8?q?1756369434034146812?= Remove unused constants at beginning of r8192E_hw.h. A part of the constants would need to be renamed because of CamelCase on others spaces are missing before and after "<<". Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 858cfc203f13..cc1e62f7074d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -12,63 +12,27 @@ enum baseband_config { BB_CONFIG_AGC_TAB = 1, }; -#define RTL8187_REQT_READ 0xc0 -#define RTL8187_REQT_WRITE 0x40 -#define RTL8187_REQ_GET_REGS 0x05 -#define RTL8187_REQ_SET_REGS 0x05 - -#define MAX_TX_URB 5 -#define MAX_RX_URB 16 -#define RX_URB_SIZE 9100 - -#define BB_ANTATTEN_CHAN14 0x0c -#define BB_ANTENNA_B 0x40 - -#define BB_HOST_BANG (1<<30) -#define BB_HOST_BANG_EN (1<<2) -#define BB_HOST_BANG_CLK (1<<1) -#define BB_HOST_BANG_RW (1<<3) -#define BB_HOST_BANG_DATA 1 - #define RTL8190_EEPROM_ID 0x8129 #define EEPROM_VID 0x02 #define EEPROM_DID 0x04 #define EEPROM_NODE_ADDRESS_BYTE_0 0x0C -#define EEPROM_TxPowerDiff 0x1F - - -#define EEPROM_PwDiff 0x21 -#define EEPROM_CrystalCap 0x22 - - - -#define EEPROM_TxPwIndex_CCK_V1 0x29 -#define EEPROM_TxPwIndex_OFDM_24G_V1 0x2C -#define EEPROM_TxPwIndex_Ver 0x27 - -#define EEPROM_Default_TxPowerDiff 0x0 #define EEPROM_Default_ThermalMeter 0x77 #define EEPROM_Default_AntTxPowerDiff 0x0 #define EEPROM_Default_TxPwDiff_CrystalCap 0x5 -#define EEPROM_Default_PwDiff 0x4 -#define EEPROM_Default_CrystalCap 0x5 #define EEPROM_Default_TxPower 0x1010 #define EEPROM_ICVersion_ChannelPlan 0x7C #define EEPROM_Customer_ID 0x7B #define EEPROM_RFInd_PowerDiff 0x28 + #define EEPROM_ThermalMeter 0x29 #define EEPROM_TxPwDiff_CrystalCap 0x2A #define EEPROM_TxPwIndex_CCK 0x2C #define EEPROM_TxPwIndex_OFDM_24G 0x3A -#define EEPROM_Default_TxPowerLevel 0x10 -#define EEPROM_IC_VER 0x7d -#define EEPROM_CRC 0x7e #define EEPROM_CID_DEFAULT 0x0 #define EEPROM_CID_CAMEO 0x1 #define EEPROM_CID_RUNTOP 0x2 -#define EEPROM_CID_Senao 0x3 #define EEPROM_CID_TOSHIBA 0x4 #define EEPROM_CID_NetCore 0x5 #define EEPROM_CID_Nettronix 0x6 From patchwork Sun Jan 29 14:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1773779wrn; Sun, 29 Jan 2023 07:00:21 -0800 (PST) X-Google-Smtp-Source: AK7set9H1HEblGZd1x2+rbgp2TAIKWEutVOXtC4CIQBITQXGYFR/13Q5LO73Dap3TsdoOf4z1RG5 X-Received: by 2002:a17:906:da19:b0:882:239e:23c0 with SMTP id fi25-20020a170906da1900b00882239e23c0mr5897983ejb.12.1675004421607; Sun, 29 Jan 2023 07:00:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004421; cv=none; d=google.com; s=arc-20160816; b=GMDNDv6cl91DZb+3eDqbAzYMXs2pHH1wCsJ00Ebt6eDOF8SFTj6Z1lvRQw1oz958Gc Fst+5cd/9zW51Qe08ytmWUpGQydQMGFj/K2SMbWknUTExGBEJcvAIdVTSWFlV3pV8AHG pZ15ULZvXFtQ1hQoJNm1JO6FsAVq4SSaq3vCVNkJfrpco8aYF2gmh7UMZ63dXzDixF2R Zv+DasZs7QcuU1CciQOWvvL6tTyf0jfWiJZ8+xtpvI+DQHSaIZ8+PTm3sfcnyr68l9he TmXgob6zsX7E5eifr7ST1vD65jYOFFUCOJu56ySDjGoSeXcBYebnmxNmTF0KSjSsjVKS 4Evw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=u6/SXN7va6FFFDQOTORqHE36jhhud+i2AemfQKfdFEY=; b=nV3czrbbjycv3wHWH2QavowH0BWmaxvtWlSlyxkIEfmdBjgenhcrEjJirBjDSkD7GT XjZQlDuZyFxmm6uLeoIz+TK6WmE1oZyIol64y69cCA5Djtvp47N0fI3nXqtc/F9bG2Yz XwZzRpwkBtmdyj/DuHPL2zV+JOHwmD53GNXLB0lGPHUROph1mLBGq9mfGESyPA8EVhWs pO1+TXwjmUILFNblYKvqNIkXThEoGdzqj6ICAobtoCYdD74FmSqNi0k+nUVcexfs/gih LwdXP6JkLXiVw5BHLUXo4SiTH4pBBWL7/DTTeWdtBo5dMR9sCVcKKVYZqSwDayj9pL9f PATw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GIPatdy4; 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 vz13-20020a17090704cd00b00887a25c255asi1484857ejb.170.2023.01.29.06.59.57; Sun, 29 Jan 2023 07:00:21 -0800 (PST) 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=GIPatdy4; 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 S234511AbjA2O7G (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234881AbjA2O7C (ORCPT ); Sun, 29 Jan 2023 09:59:02 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E273316ADB for ; Sun, 29 Jan 2023 06:58:46 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id j32-20020a05600c1c2000b003dc4fd6e61dso1561597wms.5 for ; Sun, 29 Jan 2023 06:58:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=u6/SXN7va6FFFDQOTORqHE36jhhud+i2AemfQKfdFEY=; b=GIPatdy4NNF54VmSgtRWCbTWaYim4FAv0x9sZqX/fJCmwWcQr4CFp0o0i3m8H9fE25 bhU+IivlegVU/KN0HMBM5RK9c0gb/iUcTXaWtqHa249pPlAe9tq655yggUhdT+4BElro QUemw5ArYBDdhEcFu+E45IUPJtY+2Uc89yY/j2QaDg+sQiH1r9fiRa4cIXbdoONhJLgL W0TiBCHWnxddOgi+mqV8lYBq7WQ0SVqh4WLYC2T1fLcYbKjIKmN3IhZ4YmSmkTb6qAas u3Dgr+ks5UVqf03Cq4NHaFGS1iz5BrlQPAeoVXD9gNsamVHk1F0gN0ptAiLGPPzjX8NF ss0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=u6/SXN7va6FFFDQOTORqHE36jhhud+i2AemfQKfdFEY=; b=k5d5pw63hod/7lezeDqcn73aFjCsERt2qvYaYvHEqu2DEvkCOPCgmaoSyJfdtbB78R x8cYP9mIt63IkHGKd+7L4eenbOSdaJif1UI2tbBQCTOjjvlQk/3WV7OFS0EScGZ3KaHW VIKIo+YjTfqK5AAWSZVvW82kOQzk1OqrnRtxkfL9DMOgdFr1r2RxIm2z3fsHTD1cNHwb 1OKFCO0ttvxX6x4bRugtnxAWCwW1ryQ06uHsPud3c70bGafM9ge10zrc0aY4FQsPzbtB NzNdmcGVwEFEV5692IgAxOkdXoLb+eB3Iq1NkvtyJ60rmwSDF3lsOlowTxTwfRkmH5kD /lsQ== X-Gm-Message-State: AO0yUKUMPbAH/iMqUipOCA7hHSWiM4+DcVEIxOSXlPegdBELqhi7Vn8A WYImbprDD0W0kUM6iT7SZHeDuLKPJTc= X-Received: by 2002:a05:600c:1f18:b0:3dc:53fc:c8b3 with SMTP id bd24-20020a05600c1f1800b003dc53fcc8b3mr558719wmb.3.1675004325427; Sun, 29 Jan 2023 06:58:45 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c468c00b003dc22ee5a2bsm11688082wmo.39.2023.01.29.06.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:44 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:43 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Remove unused constants in _RTL8192Pci_HW Message-ID: <7eef6b217c00d123ee7194191209ff3bee707f8c.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369436263786516?= X-GMAIL-MSGID: =?utf-8?q?1756369436263786516?= Remove unused constants in and after _RTL8192Pci_HW of r8192E_hw.h. A part of the constants would need to be renamed because of CamelCase on others spaces are missing before and after "<<". Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 148 +----------------- 1 file changed, 1 insertion(+), 147 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index cc1e62f7074d..13c0e5218ecf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -41,72 +41,39 @@ enum baseband_config { #define EEPROM_CID_WHQL 0xFE enum _RTL8192Pci_HW { MAC0 = 0x000, - MAC1 = 0x001, - MAC2 = 0x002, - MAC3 = 0x003, MAC4 = 0x004, - MAC5 = 0x005, PCIF = 0x009, -#define MXDMA2_16bytes 0x000 -#define MXDMA2_32bytes 0x001 -#define MXDMA2_64bytes 0x010 -#define MXDMA2_128bytes 0x011 -#define MXDMA2_256bytes 0x100 -#define MXDMA2_512bytes 0x101 -#define MXDMA2_1024bytes 0x110 #define MXDMA2_NoLimit 0x7 -#define MULRW_SHIFT 3 #define MXDMA2_RX_SHIFT 4 #define MXDMA2_TX_SHIFT 0 PMR = 0x00c, EPROM_CMD = 0x00e, -#define EPROM_CMD_RESERVED_MASK BIT5 + #define EPROM_CMD_9356SEL BIT4 #define EPROM_CMD_OPERATING_MODE_SHIFT 6 -#define EPROM_CMD_OPERATING_MODE_MASK ((1<<7)|(1<<6)) -#define EPROM_CMD_CONFIG 0x3 #define EPROM_CMD_NORMAL 0 -#define EPROM_CMD_LOAD 1 #define EPROM_CMD_PROGRAM 2 #define EPROM_CS_BIT 3 #define EPROM_CK_BIT 2 #define EPROM_W_BIT 1 #define EPROM_R_BIT 0 - AFR = 0x010, -#define AFR_CardBEn (1<<0) -#define AFR_CLKRUN_SEL (1<<1) -#define AFR_FuncRegEn (1<<2) - ANAPAR = 0x17, #define BB_GLOBAL_RESET_BIT 0x1 BB_GLOBAL_RESET = 0x020, BSSIDR = 0x02E, CMDR = 0x037, -#define CR_RST 0x10 #define CR_RE 0x08 #define CR_TE 0x04 -#define CR_MulRW 0x01 SIFS = 0x03E, - TCR = 0x040, RCR = 0x044, -#define RCR_FILTER_MASK (BIT0 | BIT1 | BIT2 | BIT3 | BIT5 | BIT12 | \ - BIT18 | BIT19 | BIT20 | BIT21 | BIT22 | BIT23) #define RCR_ONLYERLPKT BIT31 -#define RCR_ENCS2 BIT30 -#define RCR_ENCS1 BIT29 -#define RCR_ENMBID BIT27 -#define RCR_ACKTXBW (BIT24|BIT25) #define RCR_CBSSID BIT23 -#define RCR_APWRMGT BIT22 #define RCR_ADD3 BIT21 #define RCR_AMF BIT20 -#define RCR_ACF BIT19 #define RCR_ADF BIT18 -#define RCR_RXFTH BIT13 #define RCR_AICV BIT12 -#define RCR_ACRC32 BIT5 #define RCR_AB BIT3 #define RCR_AM BIT2 #define RCR_APM BIT1 @@ -115,8 +82,6 @@ enum _RTL8192Pci_HW { #define RCR_FIFO_OFFSET 13 SLOT_TIME = 0x049, ACK_TIMEOUT = 0x04c, - PIFS_TIME = 0x04d, - USTIME = 0x04e, EDCAPARA_BE = 0x050, EDCAPARA_BK = 0x054, EDCAPARA_VO = 0x058, @@ -125,53 +90,25 @@ enum _RTL8192Pci_HW { #define AC_PARAM_ECW_MAX_OFFSET 12 #define AC_PARAM_ECW_MIN_OFFSET 8 #define AC_PARAM_AIFS_OFFSET 0 - RFPC = 0x05F, - CWRR = 0x060, BCN_TCFG = 0x062, #define BCN_TCFG_CW_SHIFT 8 #define BCN_TCFG_IFS 0 BCN_INTERVAL = 0x070, ATIMWND = 0x072, BCN_DRV_EARLY_INT = 0x074, -#define BCN_DRV_EARLY_INT_SWBCN_SHIFT 8 -#define BCN_DRV_EARLY_INT_TIME_SHIFT 0 BCN_DMATIME = 0x076, BCN_ERR_THRESH = 0x078, RWCAM = 0x0A0, -#define CAM_CM_SecCAMPolling BIT31 -#define CAM_CM_SecCAMClr BIT30 -#define CAM_CM_SecCAMWE BIT16 -#define CAM_VALID BIT15 -#define CAM_NOTVALID 0x0000 -#define CAM_USEDK BIT5 - -#define CAM_NONE 0x0 -#define CAM_WEP40 0x01 -#define CAM_TKIP 0x02 -#define CAM_AES 0x04 -#define CAM_WEP104 0x05 - #define TOTAL_CAM_ENTRY 32 - -#define CAM_CONFIG_USEDK true -#define CAM_CONFIG_NO_USEDK false -#define CAM_WRITE BIT16 -#define CAM_READ 0x00000000 -#define CAM_POLLINIG BIT31 -#define SCR_UseDK 0x01 WCAMI = 0x0A4, - RCAMO = 0x0A8, SECR = 0x0B0, #define SCR_TxUseDK BIT0 #define SCR_RxUseDK BIT1 #define SCR_TxEncEnable BIT2 #define SCR_RxDecEnable BIT3 -#define SCR_SKByA2 BIT4 #define SCR_NoSKMC BIT5 SWREGULATOR = 0x0BD, INTA_MASK = 0x0f4, -#define IMR8190_DISABLED 0x0 -#define IMR_ATIMEND BIT28 #define IMR_TBDOK BIT27 #define IMR_TBDER BIT26 #define IMR_TXFOVW BIT15 @@ -192,29 +129,9 @@ enum _RTL8192Pci_HW { #define IMR_ROK BIT0 ISR = 0x0f8, TPPoll = 0x0fd, -#define TPPoll_BKQ BIT0 -#define TPPoll_BEQ BIT1 -#define TPPoll_VIQ BIT2 -#define TPPoll_VOQ BIT3 -#define TPPoll_BQ BIT4 #define TPPoll_CQ BIT5 -#define TPPoll_MQ BIT6 -#define TPPoll_HQ BIT7 -#define TPPoll_HCCAQ BIT8 -#define TPPoll_StopBK BIT9 -#define TPPoll_StopBE BIT10 -#define TPPoll_StopVI BIT11 -#define TPPoll_StopVO BIT12 -#define TPPoll_StopMgt BIT13 -#define TPPoll_StopHigh BIT14 -#define TPPoll_StopHCCA BIT15 -#define TPPoll_SHIFT 8 - PSR = 0x0ff, -#define PSR_GEN 0x0 -#define PSR_CPU 0x1 CPU_GEN = 0x100, - BB_RESET = 0x101, #define CPU_CCK_LOOPBACK 0x00030000 #define CPU_GEN_SYSTEM_RESET 0x00000001 #define CPU_GEN_FIRMWARE_RESET 0x00000008 @@ -225,31 +142,13 @@ enum _RTL8192Pci_HW { #define CPU_GEN_PWR_STB_CPU 0x00000004 #define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF #define CPU_GEN_NO_LOOPBACK_SET 0x00080000 -#define CPU_GEN_GPIO_UART 0x00007000 - - LED1Cfg = 0x154, - LED0Cfg = 0x155, - - AcmAvg = 0x170, AcmHwCtrl = 0x171, -#define AcmHw_HwEn BIT0 #define AcmHw_BeqEn BIT1 #define AcmHw_ViqEn BIT2 #define AcmHw_VoqEn BIT3 -#define AcmHw_BeqStatus BIT4 -#define AcmHw_ViqStatus BIT5 -#define AcmHw_VoqStatus BIT6 - AcmFwCtrl = 0x172, -#define AcmFw_BeqStatus BIT0 -#define AcmFw_ViqStatus BIT1 -#define AcmFw_VoqStatus BIT2 - VOAdmTime = 0x174, - VIAdmTime = 0x178, - BEAdmTime = 0x17C, RQPN1 = 0x180, RQPN2 = 0x184, RQPN3 = 0x188, - QPRR = 0x1E0, QPNR = 0x1F0, BQDA = 0x200, HQDA = 0x204, @@ -260,40 +159,13 @@ enum _RTL8192Pci_HW { VIQDA = 0x218, BEQDA = 0x21C, BKQDA = 0x220, - RCQDA = 0x224, RDQDA = 0x228, - MAR0 = 0x240, - MAR4 = 0x244, - - CCX_PERIOD = 0x250, - CLM_RESULT = 0x251, - NHM_PERIOD = 0x252, - - NHM_THRESHOLD0 = 0x253, - NHM_THRESHOLD1 = 0x254, - NHM_THRESHOLD2 = 0x255, - NHM_THRESHOLD3 = 0x256, - NHM_THRESHOLD4 = 0x257, - NHM_THRESHOLD5 = 0x258, - NHM_THRESHOLD6 = 0x259, - - MCTRL = 0x25A, - - NHM_RPI_COUNTER0 = 0x264, - NHM_RPI_COUNTER1 = 0x265, - NHM_RPI_COUNTER2 = 0x266, - NHM_RPI_COUNTER3 = 0x267, - NHM_RPI_COUNTER4 = 0x268, - NHM_RPI_COUNTER5 = 0x269, - NHM_RPI_COUNTER6 = 0x26A, - NHM_RPI_COUNTER7 = 0x26B, WFCRC0 = 0x2f0, WFCRC1 = 0x2f4, WFCRC2 = 0x2f8, BW_OPMODE = 0x300, -#define BW_OPMODE_11J BIT0 #define BW_OPMODE_5G BIT1 #define BW_OPMODE_20MHZ BIT2 IC_VERRSION = 0x301, @@ -304,7 +176,6 @@ enum _RTL8192Pci_HW { #define MSR_LINK_SHIFT 0 #define MSR_LINK_ADHOC 1 #define MSR_LINK_MASTER 3 -#define MSR_LINK_ENEDCA (1<<4) #define MSR_NOLINK 0x00 #define MSR_ADHOC 0x01 @@ -316,12 +187,7 @@ enum _RTL8192Pci_HW { #define RETRY_LIMIT_LONG_SHIFT 0 TSFR = 0x308, RRSR = 0x310, -#define RRSR_RSC_OFFSET 21 #define RRSR_SHORT_OFFSET 23 -#define RRSR_RSC_DUPLICATE 0x600000 -#define RRSR_RSC_UPSUBCHNL 0x400000 -#define RRSR_RSC_LOWSUBCHNL 0x200000 -#define RRSR_SHORT 0x800000 #define RRSR_1M BIT0 #define RRSR_2M BIT1 #define RRSR_5_5M BIT2 @@ -334,14 +200,6 @@ enum _RTL8192Pci_HW { #define RRSR_36M BIT9 #define RRSR_48M BIT10 #define RRSR_54M BIT11 -#define RRSR_MCS0 BIT12 -#define RRSR_MCS1 BIT13 -#define RRSR_MCS2 BIT14 -#define RRSR_MCS3 BIT15 -#define RRSR_MCS4 BIT16 -#define RRSR_MCS5 BIT17 -#define RRSR_MCS6 BIT18 -#define RRSR_MCS7 BIT19 #define BRSR_AckShortPmb BIT23 UFWP = 0x318, RATR0 = 0x320, @@ -393,10 +251,6 @@ enum _RTL8192Pci_HW { ; #define GPI 0x108 -#define GPO 0x109 -#define GPE 0x10a - -#define HWSET_MAX_SIZE_92S 128 #define ANAPAR_FOR_8192PciE 0x17 From patchwork Sun Jan 29 14:58:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1776545wrn; Sun, 29 Jan 2023 07:05:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXs1NMN2EL/uO93qyN8FVhQawAObHxjE9FzlN5Odp7xodQhB4D0MNjpkO6ZBFZbpoiyANE4M X-Received: by 2002:a17:906:583:b0:7c1:65f5:7b95 with SMTP id 3-20020a170906058300b007c165f57b95mr47590161ejn.26.1675004722564; Sun, 29 Jan 2023 07:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675004722; cv=none; d=google.com; s=arc-20160816; b=bttzcxaOun3FXc0THl2n6PjTU3iqL1/pkhMOSr6sQNuNik5vkZTbCkR7tI8I73hu04 Ock76Mk1nPhAQSJWMYF6IYhopoSO05kAPjl9QNq998dLCPLoWOp0filXTNeoutseFLjv wMqeRTkJPc/NrikT+ebfF6IFsnolCI/03owJLAKUt2kWm69u+p3bA2QnQUrzTRKsBL2s 8Pal8u4LIWtt5F9X9it5O0u4E9LA2a1hBY+AZEzkVXsOME/7WM0Y4OHGcALLgZP+LZiN RCp0BEG0ESVYwLxvD0cGXkpS78YWcyRHnW+WNV3HmJ6pm2LDHCMihl/VWveJ6XUZ6jLm EOaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=BswoXSk0tt7am5qFkTWIl3kgy0lKZ3uX9F+K6HQ583ZZBnxGnMs5VF96+wslqsg9zk qpRHShFgZVzKNgem/3aslu6qQgb1UnXQk8AM/64EYQEak4cPHRhhOFYFMDf8+OsFsk6M dM8JqCn+a4FmqYAxoqCXoNDpolIRSb7nxs9VcyzF7bdK1/KXDg0W5HK4I3CPhwohthgC 63OuYu7jz5pJOQ0qPkj8kNiOZHcBV4LBy/uPTkf7X+jDuIFNaACT4I7Zo0yr9YZItL2N v1WLhHwQtznc31V1tDQs9VGHE7JqNjV/vrzGKvk52e19qYB5lVyEo/Sytvdo4qMMljgR FSiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Y1HiMOEf; 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 r5-20020a170906a20500b008784bf181ebsi12385345ejy.147.2023.01.29.07.04.58; Sun, 29 Jan 2023 07:05:22 -0800 (PST) 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=Y1HiMOEf; 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 S235056AbjA2O7Z (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234928AbjA2O7S (ORCPT ); Sun, 29 Jan 2023 09:59:18 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7D101E2A5 for ; Sun, 29 Jan 2023 06:58:53 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id k16so6448834wms.2 for ; Sun, 29 Jan 2023 06:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=Y1HiMOEfkfEBI+WsKOWdGoVrlidn6m5IQOQ7p2ej9hLXLo9zhHSNSSNF4iUOPzpnnx CG1w/FQv/WoaFNymuO8yY5jwia+d1/xZgMCP64GfZ3sDgWIPZXy29kAeoy354d474PZP MfMMS0hn99o9c0/R9sHthbB+fQVryDRORZdd0X4OGROGOKraqe6mJ7y8ZRTRw/YI5XV5 doJGT1MIdxC8Re+2Swqjkl15hg2WW7g/0END+bUFDfmNAKExWI05MLGyc0XODxgxA9Zi nP8Vx9r0ZPpAZ6eCJT7MxEyrmtY/JXX4pX/Yjwdq/SZKCJMPFxo3s24H2wBFocXb3Ok6 G7qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FlMjHgQlaK6FHnQDYx0IosytZPIxnHkiOAPvdi19oaQ=; b=PMEH37w+M1YXAPpvlmg9xmu+llixYZiDzRbPUW+rveWp+SZEY/QwnKVAwUPluRdf5r x50fBQV5N2iVYrTYgdeatniEBVX9g8nI0Qatx4OsKcpTTZzOPRJbiSimJ9K2DbAtD+mc MIZwI6BecDvQhfYePERTfT18Brnr6FR4YgopoL04MLxOBXAz3/AIvSOFyP4EAfbkmYVV 7hP1pNFGTqeWUmaCLlmtLjzwNFy0u02uLDWDhGTKYNjKlC6TBV9W8CB4hGM4pmbxExIF GMeT2ciE5mn3cpOCTU2+NYw+xlHuzq8G+rO3ZALIvlG7zGePvRbSZEnyhWO4M/ngJINr EY4A== X-Gm-Message-State: AO0yUKWmQfYSX0WfCps7gH/kfsBxWMcuMkyXWKExjR4qXrP9D8B4tEbG B1wFtjXQSE4yiOf3tA4LqHk= X-Received: by 2002:a05:600c:1e02:b0:3dc:4234:fe89 with SMTP id ay2-20020a05600c1e0200b003dc4234fe89mr1793379wmb.2.1675004332439; Sun, 29 Jan 2023 06:58:52 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id z3-20020a05600c078300b003db12112fcfsm9931608wmo.4.2023.01.29.06.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:51 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:49 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Remove used constants MSR_LINK_SH.. and MSR_LINK_N.. Message-ID: <46bd1f075d5e4d211e1fc827843933907f7fee29.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756369751802727064?= X-GMAIL-MSGID: =?utf-8?q?1756369751802727064?= Remove used constants MSR_LINK_SHIFT = 0 and MSR_LINK_NONE = 0. Use rules a << 0 = a, 0 << 0 = 0 and msr | 0 = msr to remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 +++--------- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1677b6c5d363..62f179f2f174 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -54,22 +54,16 @@ static void _rtl92e_update_msr(struct net_device *dev) switch (priv->rtllib->iw_mode) { case IW_MODE_INFRA: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_MANAGED; LedAction = LED_CTL_LINK; break; case IW_MODE_ADHOC: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_ADHOC; break; case IW_MODE_MASTER: if (priv->rtllib->state == RTLLIB_LINKED) - msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT); - else - msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT); + msr |= MSR_LINK_MASTER; break; default: break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 13c0e5218ecf..3782db125300 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -172,8 +172,6 @@ enum _RTL8192Pci_HW { MSR = 0x303, #define MSR_LINK_MASK ((1<<0)|(1<<1)) #define MSR_LINK_MANAGED 2 -#define MSR_LINK_NONE 0 -#define MSR_LINK_SHIFT 0 #define MSR_LINK_ADHOC 1 #define MSR_LINK_MASTER 3 From patchwork Sun Jan 29 14:58:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 50000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1781951wrn; Sun, 29 Jan 2023 07:18:58 -0800 (PST) X-Google-Smtp-Source: AK7set8togFJNFc2Y6AdubiX3Mw4xMj0jIjozN/ZJm73P8iOtvkbVHdcNKza+zf5DsnUgFG4oFpE X-Received: by 2002:a17:906:b255:b0:87c:77b7:f97b with SMTP id ce21-20020a170906b25500b0087c77b7f97bmr8226947ejb.32.1675005538142; Sun, 29 Jan 2023 07:18:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675005538; cv=none; d=google.com; s=arc-20160816; b=KAlzaX+9uOe4qPnrXvsUsDqRpmzzexlSCKOrVMkqc0CKgT8FGeCRYgRZWmb8Rd/ZaF vk80lTRvrqwuKFWbNFAn7ihbFxYHAfKpieu4SzUUOngbF6E1SIfVQK+fGWQonKrnnmoX EkNhE8qS7YTuYUT+uZKFAGBgT4R1d4fsrJbcyxwuo+BxoZn4BmJHrMcsE9jOpyZUazMP v+/TWBbKsYlOVux5SNJ+5Q3yIeRRlLxEKqCQkZgUIK0UjG7lTeI23Lx+bb+IIvOphKy4 eGAiIMbVtPURpO9xhWpXiummyNMFBj4tv8vXKc7mbzr4G3L0AOYs/od6RYnEL2XPRWdu X8uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=U/gZ+8LIHmPXx4BBaPzt1UXYgMFGNlGYsRfi+PpxjVc=; b=ysccMELbbUdedFCnUEbfC4WOZcBwIOZQgShiYizDNz1UlY+2Dw3oWLTPVl89xDLZ5v +iYzSYzVBL5Xi05ecDpilKqWjj/wt1Aftl+W3t61I5ZGyvqYUzrtnaEhPciK8f5xqm5D taV/DY6n1sJXiDOmPJC9dtDFnAB2MwYDzd9ConjFWTLwBRCxW8Lh4tzvh5Zu1ytEtoEc iewitWu0Xa8DQQu01z05tVnwhI0h5Gj0/DMtpjiA5Z+HixkC7pDW4w2VrsFX/6RkvvOI s5Ziw78kCwfGMWbUacdMNEEQB9CZ+kiJZ3JeybvsqZ1m/IbPTioYIfuHHmtogq92Va5P rxUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HSnJAIfH; 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 e24-20020a170906749800b0087bd76ce97dsi10076547ejl.112.2023.01.29.07.18.33; Sun, 29 Jan 2023 07:18:58 -0800 (PST) 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=HSnJAIfH; 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 S235037AbjA2O7j (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235057AbjA2O72 (ORCPT ); Sun, 29 Jan 2023 09:59:28 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25F171E9C8 for ; Sun, 29 Jan 2023 06:59:05 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id f47-20020a05600c492f00b003dc584a7b7eso386376wmp.3 for ; Sun, 29 Jan 2023 06:59:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=U/gZ+8LIHmPXx4BBaPzt1UXYgMFGNlGYsRfi+PpxjVc=; b=HSnJAIfHtBRC2LW9lr7J0a38laFODYBoE+evGrrIE2YsLLwsO7iUSZA59yHYf444U4 tmk6YyV+KBRx9IvpPPS05+RrIuF6WKvZhawwnkd5+OTww9eI8SAoYXy00PqO8QFfnZNG zHSkS8d0yvdgbQnAVGeVhP0M5wC3uCDkQP8CqSoiAvjRwcF/B0YmAakbaSaeCSS+6rmM B8oqZJnvvG8YioiOXp5hOQ+A01S/Vc4KWuqqoG9JsbP3U4pBBIWqUocwQj/btsKhF9Fv sNo5U9f9TLlWs3UZcS7VY4nrjbkIvilPcK1IlbGbvZCh0f3WCCfLZyVUbblsY5bhRJoK kr6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=U/gZ+8LIHmPXx4BBaPzt1UXYgMFGNlGYsRfi+PpxjVc=; b=GV0Yw9YooihMZH/Db4BmcOV2tI9wh8GprG42GBCooa7yQvYjZ5XTjHbEjiMP/G/kqq v7oVt1yKB4SX16SNa4y014UdNyd3AC1lyPvIopgfCMi2bG6aJ/jQu4tm6WGNws+ejSZl qcuGhOHWdyLRPAUxmAlfYzpyxyct4ww9metCvHqOBF42/0t6mvPNNpQEoDLEswberNfi veGq0tWWFRJvzj7drZMo1E8dBhOeNUOP6Rvlf5mIUBbrINFrRhcigo7KC5jwe1n0MZFa 7btsXvKz92LFXnrFSaJ/R+D4z0EfO88g/P5xQQhbd3I15OTgVQRHNCpIcURF+XvGedDg bo5A== X-Gm-Message-State: AO0yUKWBkvlxwWG7GZ1O8xWhaoChixy9Ib1zrkQNBzvGMxU+Uoq0iHGU TOo4OhfuabCExegIJfFedFI= X-Received: by 2002:a05:600c:1f18:b0:3dc:53fc:c8b3 with SMTP id bd24-20020a05600c1f1800b003dc53fcc8b3mr558789wmb.3.1675004339836; Sun, 29 Jan 2023 06:58:59 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id n17-20020a1c7211000000b003dc3f07c876sm6974466wmc.46.2023.01.29.06.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:58:59 -0800 (PST) Date: Sun, 29 Jan 2023 15:58:57 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Rename _RTL8192Pci_HW, MXDMA2_NoLimit and TPPoll Message-ID: <1911a2bf4dfe6633e778d86d3aad1553cb629eb3.1675003608.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756370607165467491?= X-GMAIL-MSGID: =?utf-8?q?1756370607165467491?= Rename enum _RTL8192Pci_HW to _RTL8192PCI_HW and variable MXDMA2_NoLimit to MXDMA2_NO_LIMIT and TPPoll to TP_POLL to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index 8bf06f736ffb..374f61e931f5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -76,7 +76,7 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data, } while (frag_offset < len); - rtl92e_writeb(dev, TPPoll, TPPoll_CQ); + rtl92e_writeb(dev, TP_POLL, TPPoll_CQ); Failed: return rt_status; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 62f179f2f174..37d304a0f4c1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -629,8 +629,8 @@ bool rtl92e_start_adapter(struct net_device *dev) _rtl92e_hwconfig(dev); rtl92e_writeb(dev, CMDR, CR_RE | CR_TE); - rtl92e_writeb(dev, PCIF, ((MXDMA2_NoLimit<dev_addr)[0]); rtl92e_writew(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]); rtl92e_writel(dev, RCR, priv->receive_config); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 3782db125300..1cb723f71f43 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -39,11 +39,11 @@ enum baseband_config { #define EEPROM_CID_Pronet 0x7 #define EEPROM_CID_DLINK 0x8 #define EEPROM_CID_WHQL 0xFE -enum _RTL8192Pci_HW { +enum _RTL8192PCI_HW { MAC0 = 0x000, MAC4 = 0x004, PCIF = 0x009, -#define MXDMA2_NoLimit 0x7 +#define MXDMA2_NO_LIMIT 0x7 #define MXDMA2_RX_SHIFT 4 #define MXDMA2_TX_SHIFT 0 @@ -128,7 +128,7 @@ enum _RTL8192Pci_HW { #define IMR_VODOK BIT1 #define IMR_ROK BIT0 ISR = 0x0f8, - TPPoll = 0x0fd, + TP_POLL = 0x0fd, #define TPPoll_CQ BIT5 PSR = 0x0ff, CPU_GEN = 0x100, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 26cf4b5165f5..104b16cfa979 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1646,7 +1646,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) spin_unlock_irqrestore(&priv->irq_th_lock, flags); netif_trans_update(dev); - rtl92e_writew(dev, TPPoll, 0x01 << tcb_desc->queue_index); + rtl92e_writew(dev, TP_POLL, 0x01 << tcb_desc->queue_index); return 0; } From patchwork Sun Jan 29 14:59:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 49999 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1781905wrn; Sun, 29 Jan 2023 07:18:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXttk2BhiZ8BjLItFfAU15rpH+doUn87SiMgEaJwJ3bJSdf+T20zW/h2bcrASbhQSvI4o/Ww X-Received: by 2002:a17:902:8304:b0:194:9de0:bed1 with SMTP id bd4-20020a170902830400b001949de0bed1mr39435167plb.32.1675005534605; Sun, 29 Jan 2023 07:18:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675005534; cv=none; d=google.com; s=arc-20160816; b=PxXRG/aMuHT3haHdVUlcFwy9O0lv8NyHgKffuOQYVDiiUzAoeVFrPgwDmSPNeEmqAU dnaE5EZFyPc5wibDJ2Ow7ucFLBT6yIhi0YfGstZMa0IAUp+FzV+Z4ghaaYLqBlNhhSDu 5zvCYuklIzcFU2xTsuC+ov3zqr9EXu6LYt9U7gRxnLRneW4y7E+CwWmFifigJZ9QASNx qc24Z44gdwpII8XR+BhAGxbxlD24c5iCaDrfeWlCXKNAlWpAHoam5Kro70kp1jPNNjEz bqeTrft5+0QW3PPSKJrMxhYPkz71V/FIcxEAl1rlz9qULyEotM5zDMmCHZZXAyJwLJO6 ktFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=9WroMkucCpLGqjqrZpH1DMrJTtDPZ7FSu1W1GIcgL1g=; b=Mcvr1p7ZUZlltKsmCWhysu2XnUue5Xy+dY9Q7ZCgu00S+Djbw/zEmgxDpYhzI8gUv+ +ZNOKjgEbOOrHNISh2E9MVr3ifD0YmHnk4fAWuiQGEr93lBNkIRnL9ni8801S/v80xA6 8Pee9JmBw1Fq13xrKKo/QbU+KlUfMyEF+owNOJQpmEFqI4Ot699+ncCn0jFRO4Xyrl1a kLgQYwAjkHiXECZRsXgipU6MKfVYJTXrlY4Y+NelSKx51FOxtnO3m2JPkYuvOUw20ANh IfzEKyhy35+LjgtkN+fLixQ2Ew9fa6Tx2DWsqxob2rzLN/e0EgMG99gkBYAEyaPb52jE I1LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="X/HTvBQY"; 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 i2-20020a17090332c200b001960f9665bdsi11939786plr.253.2023.01.29.07.18.42; Sun, 29 Jan 2023 07:18:54 -0800 (PST) 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="X/HTvBQY"; 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 S234960AbjA2O7q (ORCPT + 99 others); Sun, 29 Jan 2023 09:59:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234954AbjA2O7h (ORCPT ); Sun, 29 Jan 2023 09:59:37 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7C5C20063 for ; Sun, 29 Jan 2023 06:59:10 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id q8so6434176wmo.5 for ; Sun, 29 Jan 2023 06:59:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9WroMkucCpLGqjqrZpH1DMrJTtDPZ7FSu1W1GIcgL1g=; b=X/HTvBQYbteda5FdLw4N/ZB3BS19y2meYdFCWFfNeZNYQwu+21qu0o2Z8yiuSpI5x6 dmsf1HVYY8i8xe/JLlOk0qZxE0ORyhCx+GOgXuNcGCzcb+6bjZS5BSg/vt+P7srPXFQB 1I91VCaZlx2vgUdyjRFZT9T88xCtBqhTxVhvmtQh/vpBSasdRVJVPWEVPeOrwtIYLZAa PG+Ieq3N1M6J3O+6yotHZKduHTT/xlKG7EcfDDpfWkAbAU9hVmTyp4SSyovVlebZxC7F 0T4J7t6t0FgCO1Bu3fyKGPWF49PE7gOB5jkjNK4LgZNtRvxU/YXVYGX7pzIujY+M+zhS nNBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9WroMkucCpLGqjqrZpH1DMrJTtDPZ7FSu1W1GIcgL1g=; b=R96IGqQcZBpEsLGPqENCS8ijL/GvX6u5xqo/hAYGMyGv/IaILSh8VBm3Yr4XoMKV5M eyZIIF1W7BTzGdUyqzFOGGxcABa09IwaAqpEcAvHxShvv2PvjcdQ+U3G6X4Em6ooj+Fp whSAoh0wtqdVlKX5zKYmSVSCI775bk8rm9qz9vkFpDlvtCc3vfJ7ZaDCInYodBXWLbVD 1dXVNbvZ37loylHVWRc2QKxoGdS8DGP9FDFSpTBIcHAyjUEw8fQtojaZZ+BXBvFSARFJ 1Zbg6m5NV8Nss9T6yWw9OP8b7SrD2yRfAOg9bHNfcLIN/55hQkWqB0J0Sv/2gFxj1PlM KYwg== X-Gm-Message-State: AFqh2krcX+RBD5if+lfkg84ih+7fPjAuzQ1qSmvNLjjjiaVt92jiDBLC ABfTrWndICQodSvLReogbbw= X-Received: by 2002:a05:600c:5120:b0:3db:21b8:5f53 with SMTP id o32-20020a05600c512000b003db21b85f53mr9979012wms.1.1675004347589; Sun, 29 Jan 2023 06:59:07 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id c3-20020a1c3503000000b003dc1d668866sm13212415wma.10.2023.01.29.06.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 06:59:07 -0800 (PST) Date: Sun, 29 Jan 2023 15:59:05 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Rename TPPoll_CQ, AcmHwCtrl and AcmHw_BeqEn Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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?1756370603306621469?= X-GMAIL-MSGID: =?utf-8?q?1756370603306621469?= Rename variable TPPoll_CQ to TP_POLL_CQ and AcmHwCtrl to ACM_HW_CTRL and AcmHw_BeqEn to ACM_HW_BEQ_EN to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c index 374f61e931f5..eba8364d0ff2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c @@ -76,7 +76,7 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data, } while (frag_offset < len); - rtl92e_writeb(dev, TP_POLL, TPPoll_CQ); + rtl92e_writeb(dev, TP_POLL, TP_POLL_CQ); Failed: return rt_status; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 37d304a0f4c1..dc6e694840af 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -216,12 +216,12 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) union aci_aifsn *pAciAifsn = (union aci_aifsn *)& (qos_parameters->aifs[0]); u8 acm = pAciAifsn->f.acm; - u8 AcmCtrl = rtl92e_readb(dev, AcmHwCtrl); + u8 AcmCtrl = rtl92e_readb(dev, ACM_HW_CTRL); if (acm) { switch (eACI) { case AC0_BE: - AcmCtrl |= AcmHw_BeqEn; + AcmCtrl |= ACM_HW_BEQ_EN; break; case AC2_VI: @@ -235,7 +235,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) } else { switch (eACI) { case AC0_BE: - AcmCtrl &= (~AcmHw_BeqEn); + AcmCtrl &= (~ACM_HW_BEQ_EN); break; case AC2_VI: @@ -243,14 +243,14 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) break; case AC3_VO: - AcmCtrl &= (~AcmHw_BeqEn); + AcmCtrl &= (~ACM_HW_BEQ_EN); break; default: break; } } - rtl92e_writeb(dev, AcmHwCtrl, AcmCtrl); + rtl92e_writeb(dev, ACM_HW_CTRL, AcmCtrl); break; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h index 1cb723f71f43..c3b573090d39 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -129,7 +129,7 @@ enum _RTL8192PCI_HW { #define IMR_ROK BIT0 ISR = 0x0f8, TP_POLL = 0x0fd, -#define TPPoll_CQ BIT5 +#define TP_POLL_CQ BIT5 PSR = 0x0ff, CPU_GEN = 0x100, #define CPU_CCK_LOOPBACK 0x00030000 @@ -142,8 +142,8 @@ enum _RTL8192PCI_HW { #define CPU_GEN_PWR_STB_CPU 0x00000004 #define CPU_GEN_NO_LOOPBACK_MSK 0xFFF8FFFF #define CPU_GEN_NO_LOOPBACK_SET 0x00080000 - AcmHwCtrl = 0x171, -#define AcmHw_BeqEn BIT1 + ACM_HW_CTRL = 0x171, +#define ACM_HW_BEQ_EN BIT1 #define AcmHw_ViqEn BIT2 #define AcmHw_VoqEn BIT3 RQPN1 = 0x180,