From nobody Mon Sep 15 23:17:49 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2C5DC54EBD for ; Mon, 9 Jan 2023 19:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237538AbjAITIi (ORCPT ); Mon, 9 Jan 2023 14:08:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237542AbjAITI3 (ORCPT ); Mon, 9 Jan 2023 14:08:29 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89F4739FB9 for ; Mon, 9 Jan 2023 11:08:28 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id gh17so22657819ejb.6 for ; Mon, 09 Jan 2023 11:08:28 -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=t8N//8jqLWrIkBGyfF8wv4Tl2KGsW1laCrcUj0eqwXw=; b=TFoZZD8LmwoKwxtRMrcQl1iMqMdHwceJp7ycxW0TaVBkKDXE3wjNkomljwHAlG8l/2 A5IIo+K8J5R1vLNVNCqrNd9Ka5qxa+SSuxctHMJgm+e/rJApM2uwMEDhXBl+nzINhj9h D1LXvNht8HNxQ9h/LIJi49ycActMTGSOWKWOQnGVdUkeVS1JvAT5L2AQT5yNGhU+R4op QIgVwU045+VwFvtsA8TZygumzCmL8QAir2feCDUvtLfIvZkf6KQM1qGuFF92KfwcC9tg UH7lB/vr9R+2gK/ZVsjHOPehjsyZ6p0hUxorRirNdIsD9j83DL6Ude/JVxDkcKfGSL1G UX9A== 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=t8N//8jqLWrIkBGyfF8wv4Tl2KGsW1laCrcUj0eqwXw=; b=vLbPBDeHaHqn/qJAzg8lwR3+U7gCs5b/logaXCdf+4aICV/MGrt7yIovvVnWn6tn55 lVDJJxJICYSBHzHGQqS6kXbTVB/K79JQgzQNU+4q3mto+0N7RbOk8eQrLXxWlbHUTRZ+ 5LOn/ricaNuNKoCZR+IRiUEO+XwGcScmH/UlyXzGN7l7kihAFgz4DKY/n8moMMtiu5fs oLk1SZvwcvfvwa6P5sO4KXAC+5quas/SwiPFnnDKFEBh/NrDOCvCjxsqopz46R/n2Tcc /6AQPOSBiBz9kPRjagb1TLM2L8sTQKry/oOIdcKkTUBXaCkMI1pfKU49tjV/kOHl4QNc 1Xlw== X-Gm-Message-State: AFqh2krJWQsAQUOKfHdyOlhCvA2dgz45HhPiu/QkR0GbVVeFCmszOSIj oS51BJK7bOMIbd60f/HrMl4= X-Google-Smtp-Source: AMrXdXvHlEG9akMoa+0OXhI8w4vMSx5xTtepk+h8iZmdK4QSSVwM7MaaFnFi/ajNPe6nvHLno/8QDQ== X-Received: by 2002:a17:907:8b95:b0:84c:95c7:302d with SMTP id tb21-20020a1709078b9500b0084c95c7302dmr6110575ejc.5.1673291307022; Mon, 09 Jan 2023 11:08:27 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id ss17-20020a170907039100b0084debc3fdadsm788983ejb.188.2023.01.09.11.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:26 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:24 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/7] staging: rtl8192e: Rename ChannelPlan, eeprom_ChannelPlan and CckPwEnl Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable ChannelPlan to chnl_plan, eeprom_ChannelPlan to eeprom_chnl_plan and CckPwEnl to cck_pwr_enl to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../rtl8192e/rtl8192e/r8190P_rtl8256.c | 2 +- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index ab2e9b729883..93928f3585c1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -154,7 +154,7 @@ void rtl92e_set_cck_tx_power(struct net_device *dev, u8= powerlevel) if (priv->CustomerID =3D=3D RT_CID_819x_Netcore) TxAGC =3D 0x22; else - TxAGC +=3D priv->CckPwEnl; + TxAGC +=3D priv->cck_pwr_enl; } if (TxAGC > 0x24) TxAGC =3D 0x24; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index f02e67f68e23..25fa7714df4e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -306,7 +306,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_CustomerID =3D usValue & 0xff; usValue =3D rtl92e_eeprom_read(dev, EEPROM_ICVersion_ChannelPlan>>1); - priv->eeprom_ChannelPlan =3D usValue&0xff; + priv->eeprom_chnl_plan =3D usValue&0xff; IC_Version =3D (usValue & 0xff00)>>8; =20 ICVer8192 =3D IC_Version & 0xf; @@ -328,7 +328,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_vid =3D 0; priv->eeprom_did =3D 0; priv->eeprom_CustomerID =3D 0; - priv->eeprom_ChannelPlan =3D 0; + priv->eeprom_chnl_plan =3D 0; } =20 if (!priv->AutoloadFailFlag) { @@ -473,9 +473,9 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->rf_chip =3D RF_8256; =20 if (priv->reg_chnl_plan =3D=3D 0xf) - priv->ChannelPlan =3D priv->eeprom_ChannelPlan; + priv->chnl_plan =3D priv->eeprom_chnl_plan; else - priv->ChannelPlan =3D priv->reg_chnl_plan; + priv->chnl_plan =3D priv->reg_chnl_plan; =20 if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->CustomerID =3D RT_CID_DLINK; @@ -495,10 +495,10 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) break; case EEPROM_CID_TOSHIBA: priv->CustomerID =3D RT_CID_TOSHIBA; - if (priv->eeprom_ChannelPlan&0x80) - priv->ChannelPlan =3D priv->eeprom_ChannelPlan&0x7f; + if (priv->eeprom_chnl_plan & 0x80) + priv->chnl_plan =3D priv->eeprom_chnl_plan & 0x7f; else - priv->ChannelPlan =3D 0x0; + priv->chnl_plan =3D 0x0; break; case EEPROM_CID_Nettronix: priv->CustomerID =3D RT_CID_Nettronix; @@ -516,9 +516,9 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) break; } =20 - if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) - priv->ChannelPlan =3D 0; - priv->ChannelPlan =3D COUNTRY_CODE_WORLD_WIDE_13; + if (priv->chnl_plan > CHANNEL_PLAN_LEN - 1) + priv->chnl_plan =3D 0; + priv->chnl_plan =3D COUNTRY_CODE_WORLD_WIDE_13; =20 if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->rtllib->bSupportRemoteWakeUp =3D true; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index f8fbe78ccad9..92260d098eaa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -862,7 +862,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->cck_present_attn =3D 0; priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; - priv->CckPwEnl =3D 6; + priv->cck_pwr_enl =3D 6; priv->rst_progress =3D RESET_TYPE_NORESET; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); @@ -952,13 +952,13 @@ static short _rtl92e_get_channel_map(struct net_devic= e *dev) return -1; } =20 - if (priv->ChannelPlan >=3D COUNTRY_CODE_MAX) { + if (priv->chnl_plan >=3D COUNTRY_CODE_MAX) { netdev_info(dev, "rtl819x_init:Error channel plan! Set to default.\n"); - priv->ChannelPlan =3D COUNTRY_CODE_FCC; + priv->chnl_plan =3D COUNTRY_CODE_FCC; } dot11d_init(priv->rtllib); - dot11d_channel_map(priv->ChannelPlan, priv->rtllib); + dot11d_channel_map(priv->chnl_plan, priv->rtllib); for (i =3D 1; i <=3D 11; i++) (priv->rtllib->active_channel_map)[i] =3D 1; (priv->rtllib->active_channel_map)[12] =3D 2; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index cceb77492363..93b3b75a063f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -420,7 +420,7 @@ struct r8192_priv { u16 eeprom_vid; u16 eeprom_did; u8 eeprom_CustomerID; - u16 eeprom_ChannelPlan; + u16 eeprom_chnl_plan; =20 u8 EEPROMTxPowerLevelCCK[14]; u8 EEPROMTxPowerLevelOFDM24G[14]; @@ -451,7 +451,7 @@ struct r8192_priv { bool bTXPowerDataReadFromEEPORM; =20 u16 reg_chnl_plan; - u16 ChannelPlan; + u16 chnl_plan; u8 hw_rf_off_action; =20 bool rf_change_in_progress; @@ -460,7 +460,7 @@ struct r8192_priv { =20 u8 DM_Type; =20 - u8 CckPwEnl; + u8 cck_pwr_enl; u16 TSSI_13dBm; u32 Pwr_Track; u8 CCKPresentAttentuation_20Mdefault; --=20 2.39.0