From nobody Tue Dec 30 07:38:22 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 755B2C2BB3F for ; Sat, 18 Nov 2023 08:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232589AbjKRIvQ (ORCPT ); Sat, 18 Nov 2023 03:51:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjKRIvM (ORCPT ); Sat, 18 Nov 2023 03:51:12 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C3BEB9 for ; Sat, 18 Nov 2023 00:51:09 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9e28215db77so83272066b.1 for ; Sat, 18 Nov 2023 00:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297467; x=1700902267; darn=vger.kernel.org; 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=paSTu0WaDDknunnGESBB1JuMqk8D4OMu6cj43zrhMCg=; b=SSP43ptEtrJeSh45OWa51R3ezZ828u3p6v4H8Isp+brVSw5iKEhPaP7FavYCxOS4df yhoPFbPCsZ7J+DT8FC8z76llOUf+r6J3Wo6dU+F/6PKWaDuLd1DpIT0F+7WbztHrlOy/ v4cynCu/E8ZquEFCH1pwgDVVGkdEcH+oX8Whu85b02KSVDtPn3fuX4nEXjcXpm2MDuSB rhFTA3bqZ1vWHL5TudY9bisIziaz4i2ZUefM+bYtboB2ZGyPqOq+WBtHudl+ANAijpN5 3MzA/cEvZihOxAYVG3GCKVGb9HIb4+KnZrcE+z9QtNWcW7C6hLn1eXZYU6yBirKTiYGp zPMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297467; x=1700902267; 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=paSTu0WaDDknunnGESBB1JuMqk8D4OMu6cj43zrhMCg=; b=a4e6fWNa/s9XzmrJIe6HlV1RvSJ/FUsfSwyK/1frs9Sgi2QUVS+PQ4oEfFlLxjjs2/ 36lLwqFatNWZ6dtxR7L7qkNSF7Y/2oWTiV3KmNuMtwjgtspZIscLrQut5c9/4I0/gHkZ XBL7EHc1dj7ka7dY2BqKStuv4pL/GetEPd5BPV0Lwre7UX7r4UBDCwwLgue8QbDqA7fm XoodE18wI2qYHq79EmJImWRl3kS2yZ3gsTsWgOzzU42/X/k6oxKVeJ5COrJWiYdrNqFk 8Q69TRI5KUHkmw49oGH+ooDO4TI27JgSBqZvRyEjOiQHtOgKf4MXd94CROMIxngVY2A2 HAwA== X-Gm-Message-State: AOJu0Ywh/a/gvoT+VmjUKPBivSxkTZepN+HEc7Z7PJ86LSJ8HSO5WOgx vowha066ym3vseePO5q6qSY= X-Google-Smtp-Source: AGHT+IEWpkgxkoy1xOUSJLtY2Vdy5FLz88TbjdaC1hbBUqnyKhSWmglq4dEfcaubqhyNZsM203tWFw== X-Received: by 2002:a05:6402:22a2:b0:548:15d1:4ac with SMTP id cx2-20020a05640222a200b0054815d104acmr1154348edb.4.1700297467345; Sat, 18 Nov 2023 00:51:07 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id n6-20020aa7c786000000b005434095b179sm1493207eds.92.2023.11.18.00.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:07 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:05 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Remove unused return value of rtl92e_set_channel() Message-ID: <0c0e7c72a10731ae7ed49c8161136b0f0b63d7a0.1700296319.git.philipp.g.hortmann@gmail.com> 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" Remove unused return value of rtl92e_set_channel(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 4d12d7385041..e1bd4d67e862 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -671,16 +671,16 @@ static void _rtl92e_phy_switch_channel_work_item(stru= ct net_device *dev) _rtl92e_phy_switch_channel(dev, priv->chan); } =20 -u8 rtl92e_set_channel(struct net_device *dev, u8 channel) +void rtl92e_set_channel(struct net_device *dev, u8 channel) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 if (!priv->up) { netdev_err(dev, "%s(): Driver is not initialized\n", __func__); - return false; + return; } if (priv->sw_chnl_in_progress) - return false; + return; =20 switch (priv->rtllib->mode) { case WIRELESS_MODE_B: @@ -688,7 +688,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) netdev_warn(dev, "Channel %d not available in 802.11b.\n", channel); - return false; + return; } break; case WIRELESS_MODE_G: @@ -697,7 +697,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) netdev_warn(dev, "Channel %d not available in 802.11g.\n", channel); - return false; + return; } break; } @@ -714,7 +714,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) if (priv->up) _rtl92e_phy_switch_channel_work_item(dev); priv->sw_chnl_in_progress =3D false; - return true; + return; } =20 static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *d= ev) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 6c4c33ded6a9..ff4b4004b0d0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -41,7 +41,7 @@ void rtl92e_get_tx_power(struct net_device *dev); void rtl92e_set_tx_power(struct net_device *dev, u8 channel); u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFP= ath); =20 -u8 rtl92e_set_channel(struct net_device *dev, u8 channel); +void rtl92e_set_channel(struct net_device *dev, u8 channel); void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, enum ht_extchnl_offset Offset); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index a4afbf3e934d..9b0be6dff627 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -228,7 +228,7 @@ struct r8192_priv { struct rt_stats stats; struct iw_statistics wstats; =20 - u8 (*rf_set_chan)(struct net_device *dev, u8 ch); + void (*rf_set_chan)(struct net_device *dev, u8 ch); =20 struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_COUNT]; --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 577D5C54E76 for ; Sat, 18 Nov 2023 08:51:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232628AbjKRIvZ (ORCPT ); Sat, 18 Nov 2023 03:51:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232819AbjKRIvV (ORCPT ); Sat, 18 Nov 2023 03:51:21 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0535B9 for ; Sat, 18 Nov 2023 00:51:14 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9dd576116e3so82303166b.1 for ; Sat, 18 Nov 2023 00:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297473; x=1700902273; darn=vger.kernel.org; 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=4IeNlXsmBMHoH7xFQOzT7zMDYmFmso5R2YU54hCqJXw=; b=UipGlwvtdH3WYGdkeqIjAr2boFzGZ/Btp/WaPEAWsGFxRyPxQoaCV8gsPERJYzzfbr GaLfKDSFPXnriHi/npZjrVvdjba0ONLg71iMPERsoDj1V11Md2CJvXv/TiT5VHWbuarU Cdxt3JYCk+lxeKNdMgklc9HVcdZFZl4KPytZ+NCc+rLgaWIKk4NFZ/6n7bYyRL2+GfdB Ufl1z26YU69ICOKddRkk9fUUDzCu55j3cBNOF232c9i7xaKIbsUvbA44m8/knAwbqEKG cWUPJiABjNk+CRW792RWpYafuEE1dh/ZsRX0JUr2b9YRTuzC8fw7m10VVRCrwUgEU0l6 RTtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297473; x=1700902273; 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=4IeNlXsmBMHoH7xFQOzT7zMDYmFmso5R2YU54hCqJXw=; b=tdwxdd7iM9fpf6E8PemDxFYP//T1TFWoI0XRMEG3UFmY0Z1JiffU2F/IQLNAKuV2V5 aPp7tN9blD0Goum2ibskTK7FFXQ6iv96vaLXsHQQjLEA0pKKL+sJ3qpmFhg4mMXT3OYd GWCyYNd58T2Dl/Bvr9ho1cLgaxIWJHsQr+hj5gC0Qn6bmFUOypFakQvaThU4YCs9DbMa 6dWc+r+P8KqixRk0epwZEHskXbtSrY1O+38/19WefibY6meZOt2XS2uvBxEKIMTUS6qN /y8GcTmhTgiZ02g5TbUtbPtVFVy//7m/eNBls02tQOIkJ+k/l+8y1ubfBFBRETxS0y0u VgCA== X-Gm-Message-State: AOJu0YwR6tP5ZELTcKWcdWHGAqmY1+dJZLiv9HcFcT17shFfEP8HbURi rUTvRQAEX98WhFpuON99znU= X-Google-Smtp-Source: AGHT+IFHwZXi9hQx6GDo7DcH7fcX+4pp9aXtpSY0qesFiSTN77Cf3nH1Vx3COwZRLLVvFj66eHvjOg== X-Received: by 2002:a17:906:108f:b0:9dd:5609:55b9 with SMTP id u15-20020a170906108f00b009dd560955b9mr1172060eju.2.1700297473260; Sat, 18 Nov 2023 00:51:13 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id s27-20020a170906169b00b009b29553b648sm1643314ejd.206.2023.11.18.00.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:13 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:11 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Change parameter "ch" of set_chan() to u8 Message-ID: <4a76c0e2384d67410d383fdf860d0e0859555d1e.1700296319.git.philipp.g.hortmann@gmail.com> 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" Change parameter "ch" of set_chan() to u8 to combine functions in the following patch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 995daab906c9..98b25768f614 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -226,7 +226,7 @@ static void _rtl92e_tx_timeout(struct net_device *dev, = unsigned int txqueue) netdev_info(dev, "TXTIMEOUT"); } =20 -static void _rtl92e_set_chan(struct net_device *dev, short ch) +static void _rtl92e_set_chan(struct net_device *dev, u8 ch) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index adaab56a9fb1..1d0878d1f696 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1469,7 +1469,7 @@ struct rtllib_device { * This function can sleep. the driver should ensure * the radio has been switched before return. */ - void (*set_chan)(struct net_device *dev, short ch); + void (*set_chan)(struct net_device *dev, u8 ch); =20 /* indicate the driver that the link state is changed * for example it may indicate the card is associated now. --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 6689CC2BB3F for ; Sat, 18 Nov 2023 08:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232854AbjKRIvc (ORCPT ); Sat, 18 Nov 2023 03:51:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232779AbjKRIv0 (ORCPT ); Sat, 18 Nov 2023 03:51:26 -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 3BAB510DF for ; Sat, 18 Nov 2023 00:51:22 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9c40c3814a8so83382966b.0 for ; Sat, 18 Nov 2023 00:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297480; x=1700902280; darn=vger.kernel.org; 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=VjN035WLtuadTMm7LXZaDKsk+/K6gPiiTmDAIdpngNw=; b=G+vdkGchrx750Rla7shaxkq6xV8zkvUPuVtujRYxTe1vGdvFvRDvtCvbWOXBZi51lq ke8mVuCG2uC9WmgRViloKVY4SyQXb4+39SsgetPuCFg8hFCMVTE1gwHWd8GezNfu4df1 ih6ibvN9ZelgE5+WecCk90mjrJ5lzvDde5ZiIYNKRUHyx7SH3huD2/R+bzSDGDviIBLm UDRXxQm0NuqZVizeyOsjOwnecy12jfe+Gd/zmoo5MY6/Qd7XIXYkTMlVVJcVe5ncBEog jTrwQprTL/OLasfy0pLJli91g4qtUMr5znLH3ib2q6tuQOwUBwAtgumSCJrr+NL1AUat Gjbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297480; x=1700902280; 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=VjN035WLtuadTMm7LXZaDKsk+/K6gPiiTmDAIdpngNw=; b=NCdS4k3GrnXcOShK4eeontI8J4aR/iCQAT/8wNMuCaI/OBzeLY242rZvl6mcXqctvg kZOqW5R1WZL63joWZnV5c2Rha1tCTb3Y5Sg+kNDuY9aluvm8aUhyjeWbphtldNRTCIKM +JmsPTbhaUh//ZAFW72qWVc4Y2sZDaxXe3o/WtEYSI8U1V8O6KSWIWGsHDffTVvGRn40 himzEacvLd79KcmbFdPt5z9RcWaSTvGFx17RdFhl69ffWmgnrRfXfdgM5u0Nfm9SbRa6 WmkHi8uTQU7iSbeR/NJyIXrBcsrXIkq73GPDh/OGZNhsDFnOXev6hHN0vmHgITO01WwV Y/CQ== X-Gm-Message-State: AOJu0Yz4ehSJq84h+q3enXlMy51hMDHPVaWvYWvh7bU54P0oBvngygyX 28qkBirRgUNjM8Hg8IxrrCQ= X-Google-Smtp-Source: AGHT+IG5F9h8BVeuct8xQu0rHUtQYbzO8SW40R9kkuWIu8+iTl1P1FWgTc52bIv6c7lFf8JP4z03Zw== X-Received: by 2002:a17:906:74c1:b0:9f2:3e76:5d39 with SMTP id z1-20020a17090674c100b009f23e765d39mr1325758ejl.0.1700297480379; Sat, 18 Nov 2023 00:51:20 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id e6-20020a170906844600b009cd1fca4d68sm1658948ejy.5.2023.11.18.00.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:20 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:18 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Unwind pointer to pointer to rtl92e_set_channel() 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" Replace pointer to function to pointer to rtl92e_set_channel() with pointer to rtl92e_set_channel(). This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 13 +------------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 98b25768f614..2789f428e4f9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -226,16 +226,6 @@ static void _rtl92e_tx_timeout(struct net_device *dev,= unsigned int txqueue) netdev_info(dev, "TXTIMEOUT"); } =20 -static void _rtl92e_set_chan(struct net_device *dev, u8 ch) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - priv->chan =3D ch; - - if (priv->rf_set_chan) - priv->rf_set_chan(dev, priv->chan); -} - static void _rtl92e_update_cap(struct net_device *dev, u16 cap) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -685,7 +675,7 @@ static void _rtl92e_init_priv_handler(struct net_device= *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 priv->rtllib->softmac_hard_start_xmit =3D _rtl92e_hard_start_xmit; - priv->rtllib->set_chan =3D _rtl92e_set_chan; + priv->rtllib->set_chan =3D rtl92e_set_channel; priv->rtllib->link_change =3D rtl92e_link_change; priv->rtllib->softmac_data_hard_start_xmit =3D _rtl92e_hard_data_xmit; priv->rtllib->check_nic_enough_desc =3D _rtl92e_check_nic_enough_desc; @@ -694,7 +684,6 @@ static void _rtl92e_init_priv_handler(struct net_device= *dev) priv->rtllib->set_wireless_mode =3D rtl92e_set_wireless_mode; priv->rtllib->leisure_ps_leave =3D rtl92e_leisure_ps_leave; priv->rtllib->set_bw_mode_handler =3D rtl92e_set_bw_mode; - priv->rf_set_chan =3D rtl92e_set_channel; =20 priv->rtllib->sta_wake_up =3D rtl92e_hw_wakeup; priv->rtllib->enter_sleep_state =3D rtl92e_enter_sleep; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 9b0be6dff627..348df71e122e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -228,8 +228,6 @@ struct r8192_priv { struct rt_stats stats; struct iw_statistics wstats; =20 - void (*rf_set_chan)(struct net_device *dev, u8 ch); - struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_COUNT]; dma_addr_t rx_ring_dma; --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 75BF6C54FB9 for ; Sat, 18 Nov 2023 08:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233087AbjKRIvo (ORCPT ); Sat, 18 Nov 2023 03:51:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232967AbjKRIve (ORCPT ); Sat, 18 Nov 2023 03:51:34 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0F5D1725 for ; Sat, 18 Nov 2023 00:51:28 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9e28215db77so83283666b.1 for ; Sat, 18 Nov 2023 00:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297487; x=1700902287; darn=vger.kernel.org; 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=vMytCypAKR6h1wsB0OQEQ+cFMOVYMGL6IbHLXc4UGuE=; b=QOp7DghVXLTjC7R4yi8ZRl2+m7Ks6D7zvTmqscPCGjqJoimRC7hISTveXUzivvDWIi PaZLyrvkdS5+vDv3MoHQm4XiJ5Rwn2UOaGY8f41CxZ/5GdKwNn+2aCE1cd85HBkqR/iT FFL+I+N/xllw4a/t9pp6ovuyzQCNq4m7dRS6CJkSb4eItyUHEkMH0GeH3fSS88G/Vy47 skFZzevMIe/TCQMLZiFKkcG/4MNh9ZIpELJwcl++9NE+e6ht61Kxc1AfQSUCuPOYaAsf EKNus/6XYnn0wdwN3iGU0JTVj5Mmyam2ROXBExECcQEoV9TDz16PGAc372SNJfdJBTOv fbjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297487; x=1700902287; 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=vMytCypAKR6h1wsB0OQEQ+cFMOVYMGL6IbHLXc4UGuE=; b=RYS2Sjj4qcAH31bxdsUuI5P0AiRlJr3AHEJRiFQb5Tewix1Th22dUb65DlDSI+eU/o zU/WV6783jYgv4jMrtgwKit2vkzpaPcpY5uVAJY7b8Jr1PukO6G5JVaKyseYSWqD5iu4 0lr6xhlIbW37gLNY47VsN/rT40bKCZl9NLvti3NBiLHyyrT45MmsJL3iXwwSx67YXQ2H xndPHu+l5GN5EqnvJ6gKwW3THFzlDak43IicDkvOpXcmutUV/QMRcwB4lmYDk6fs0wr1 8FW/vnJy64EZrgOGTbdcfVtOrqEZjsViGOZJ4mdrJKClkgAhrNPFhBpSi7aOYzPb4gFA JsWQ== X-Gm-Message-State: AOJu0Ywf0s44QEw6blaEFHcDUOkOroI319Rdu+l5YPOo4ESUCpMLWntf R+AN3ndT5t4HJ84s9ETGPOU= X-Google-Smtp-Source: AGHT+IEJxyDYevO9u1ZvQlIAYKwA1u1hwMrPRuZiGLG7Gd0x+Re1XWYG1WT1bSHyS+iyT5Sg+atNYA== X-Received: by 2002:a17:906:10cf:b0:9e6:dfee:8154 with SMTP id v15-20020a17090610cf00b009e6dfee8154mr1036711ejv.3.1700297487250; Sat, 18 Nov 2023 00:51:27 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id jz12-20020a170906bb0c00b00988f168811bsm1675679ejb.135.2023.11.18.00.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:27 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:25 +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 equation that results in constant for chnl_plan 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" Remove equation for chnl_plan as the last line sets chnl_plan to a constant. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e93394c51264..44898e0be21c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -387,23 +387,15 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) =20 rtl92e_init_adaptive_rate(dev); =20 - priv->chnl_plan =3D priv->eeprom_chnl_plan; - switch (priv->eeprom_customer_id) { case EEPROM_CID_NetCore: priv->customer_id =3D RT_CID_819X_NETCORE; break; case EEPROM_CID_TOSHIBA: priv->customer_id =3D RT_CID_TOSHIBA; - if (priv->eeprom_chnl_plan & 0x80) - priv->chnl_plan =3D priv->eeprom_chnl_plan & 0x7f; - else - priv->chnl_plan =3D 0x0; break; } =20 - 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) --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 83FD1C54E76 for ; Sat, 18 Nov 2023 08:51:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232481AbjKRIv7 (ORCPT ); Sat, 18 Nov 2023 03:51:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232869AbjKRIvo (ORCPT ); Sat, 18 Nov 2023 03:51:44 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BEDCD79 for ; Sat, 18 Nov 2023 00:51:37 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9e3eaf098f1so76682966b.0 for ; Sat, 18 Nov 2023 00:51:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297496; x=1700902296; darn=vger.kernel.org; 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=fFLHsxGK7k/8eykGJrZMJGzqZ9wJ0aqJSpq01GUYpM8=; b=LGr98wLgCyrn/CP4yhiyJ8KiFXJNPcWRY3B9lj0LMh77PcmwVQN1x8K0emcRhHzKvA N5Q+hnN0f/Mlqtu/NVPZiygwVqmkzpfu+wwNFA++EICSHFLv1tTPFnWPQbLjfeQvlJ+2 VILLJr8AX/7QqJje+3R3mfUqC4Xu9/V+Hy5EcweXhjgJ/FxLuFWEthBlJKAVcDVDE/Y9 LVaouIkYzF0H2Av1nqAVbdwcolQLS0MsP3zwV45jVimsxJxk02AKfQSTGHHd6n/IHxTu fd1H9zyFfyusyUd3cf3F3bwEvJ6r6KI6YcfcnLzEvGr7EMeTe8bBNb/QXWMLL131OMro Sa2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297496; x=1700902296; 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=fFLHsxGK7k/8eykGJrZMJGzqZ9wJ0aqJSpq01GUYpM8=; b=oDCyaUfKVvEpnKnDZQ9j7L+XJa76hs8JajQHLPzXe1KLaPRRKNgFVZ6EEwouCBZ+qo Z8TTdEIlUnMJivYnUWNqXqTOZdMPLE1Ciz7Tx8r3MZ+D8w72vzJ96F4Fec/CProwuCnm 7FFnIsqPNYNX2EoM/NpwzrA+b9gWIhDq9m2KJZLBLyFT6qY/GHDIfq5QPF64RKB43eCD v/nGRcIQ6v7DwxvLb0M0Lz4P63dXEk0XkXQ2Ca3KcN/E8lhxHz5+J6nyvNYsWe/6Q2VN ACoILM76qv4EG/GwJtTGG+9a+PYWUp8jW8QhLqbhimpZ7MW5e+BLpJAm27hXLtw95J2o eicQ== X-Gm-Message-State: AOJu0Yz2/5UY4CV5KMLDf2IHdbGhrVS4ncU31ORBR1wuhOX1eqvs3sCo Y5waynji+dbTfiz0JoEMl9Q= X-Google-Smtp-Source: AGHT+IGRibVfC9vsxr71T3msML2jvfXftKU6rYG8jk8iYmowTNsklN78jaPALqMcQoG9VhQlI2kNFA== X-Received: by 2002:a17:906:1da:b0:9cf:7d6e:2c3e with SMTP id 26-20020a17090601da00b009cf7d6e2c3emr1133601ejj.7.1700297495823; Sat, 18 Nov 2023 00:51:35 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id l2-20020a170906230200b009fb1fc8c405sm214001eja.179.2023.11.18.00.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:35 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:34 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Remove constant variable chnl_plan 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" Remove constant variable chnl_plan and replace it with its constant. Remove equation that limits maximum value of chnl_plan as it is always false. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 44898e0be21c..9b51deba149b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -396,8 +396,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) break; } =20 - priv->chnl_plan =3D COUNTRY_CODE_WORLD_WIDE_13; - if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->rtllib->bSupportRemoteWakeUp =3D true; else diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 2789f428e4f9..68bd03500267 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -795,13 +795,8 @@ static short _rtl92e_get_channel_map(struct net_device= *dev) =20 struct r8192_priv *priv =3D rtllib_priv(dev); =20 - if (priv->chnl_plan >=3D COUNTRY_CODE_MAX) { - netdev_info(dev, - "rtl819x_init:Error channel plan! Set to default.\n"); - priv->chnl_plan =3D COUNTRY_CODE_FCC; - } dot11d_init(priv->rtllib); - dot11d_channel_map(priv->chnl_plan, priv->rtllib); + dot11d_channel_map(COUNTRY_CODE_WORLD_WIDE_13, 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 348df71e122e..addaa1eb39ee 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -310,7 +310,6 @@ struct r8192_priv { =20 bool tx_pwr_data_read_from_eeprom; =20 - u16 chnl_plan; u8 hw_rf_off_action; =20 bool rf_change_in_progress; --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 6C9EDC2BB3F for ; Sat, 18 Nov 2023 08:52:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232910AbjKRIwP (ORCPT ); Sat, 18 Nov 2023 03:52:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233139AbjKRIvv (ORCPT ); Sat, 18 Nov 2023 03:51:51 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81D3E1986 for ; Sat, 18 Nov 2023 00:51:45 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54488f19b6cso739664a12.1 for ; Sat, 18 Nov 2023 00:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297504; x=1700902304; darn=vger.kernel.org; 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=60TEIsDbZcJztid9/FBNOOfGZ+ibynkio00841tSlME=; b=bGkjW9qOWgjdRgjCrxeFeKdA4GUEP1/gc+CrKSnqPpYTO6sm+cf/iIBGpJD5p6I6V9 BQZIUYDHXIyrjooCQ8N2XKAbA8+rmK80VKF+cJ7Nw54X3ymbUoFfI5uXFBu3LwAXkww7 /+JW6yONZw3FCQ9QHdsIcUzskS6ZJHOTAQFGgdiKkWB+2X9nPjSgS4F85z5IQIbkklYu cf89yn+SLyULxygTGCRF1n7FM9juFKUimKBJUO4+egW8K908mYZxUtR5ee2APCn9oHWc a/qnwd/WfLlwmLesaCTQCiPLG5+D2XOi2V2V5Y1C2E7y2V4p9XtXGqZ4tFyRcGXimZOM eP1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297504; x=1700902304; 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=60TEIsDbZcJztid9/FBNOOfGZ+ibynkio00841tSlME=; b=llAavbHsq18v0Ieeh9SOkgR158691at8kc8L2Z82drkyl8ADXAcuXUjbf7AMYDRBNC 5IW/2U6uAHIBzIH6kueMO/C8RVHsrTNxTgkbBMTCByT2sNppp57QK7kbLh+4jb9NTYvg JQ+ic7v35LFJB2vvzA7BaVXBfQwgzyvEMCswOBQnjPCJLUURm59SRP48wOJeKOImw3YK huttKBQFBPSSXyxpv4RW0zoVQW7hNVdkgRygvTKEvR4HliQmyYIdBfjYZb9afwhFVCAs Ir5oR0Z4rGhYinCULBpPVguCLjMy+hthjaqxEUcHXo5pba9JkW59IgirueRD7/kWA9G/ uqAA== X-Gm-Message-State: AOJu0Yxb1R+tAijktyMiZwVEaYmpC6seA0EgU91eHHgJp49MyO0OJBZf auiEvyYqUtQPrrQ50aQqGWE= X-Google-Smtp-Source: AGHT+IHpDvqR83tfTWq7GrzTx5Ftu0W4/DcSCPG8Olvrsf3Se+/xJDhPTqZHJf/14sHUGjSXHeNG/w== X-Received: by 2002:aa7:ca50:0:b0:548:5671:8330 with SMTP id j16-20020aa7ca50000000b0054856718330mr1236640edt.3.1700297503703; Sat, 18 Nov 2023 00:51:43 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id u10-20020aa7d88a000000b0052febc781bfsm1504123edq.36.2023.11.18.00.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:43 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:42 +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 variable eeprom_chnl_plan 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" Remove unused variable eeprom_chnl_plan. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 9b51deba149b..8fe4c03b19c1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -261,7 +261,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_customer_id =3D usValue & 0xff; usValue =3D rtl92e_eeprom_read(dev, EEPROM_ICVersion_ChannelPlan >> 1); - priv->eeprom_chnl_plan =3D usValue & 0xff; IC_Version =3D (usValue & 0xff00) >> 8; =20 ICVer8192 =3D IC_Version & 0xf; @@ -283,7 +282,6 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_vid =3D 0; priv->eeprom_did =3D 0; priv->eeprom_customer_id =3D 0; - priv->eeprom_chnl_plan =3D 0; } =20 if (!priv->autoload_fail_flag) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index addaa1eb39ee..e7b331c4661c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -284,7 +284,6 @@ struct r8192_priv { u16 eeprom_vid; u16 eeprom_did; u8 eeprom_customer_id; - u16 eeprom_chnl_plan; =20 u8 eeprom_tx_pwr_level_cck[14]; u8 eeprom_tx_pwr_level_ofdm24g[14]; --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 233F9C2BB3F for ; Sat, 18 Nov 2023 08:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232339AbjKRIwT (ORCPT ); Sat, 18 Nov 2023 03:52:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233191AbjKRIv5 (ORCPT ); Sat, 18 Nov 2023 03:51:57 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7A9619BA for ; Sat, 18 Nov 2023 00:51:51 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-54115c72f78so784659a12.1 for ; Sat, 18 Nov 2023 00:51:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297510; x=1700902310; darn=vger.kernel.org; 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=y3T+DN+4X901BSZo7/K9QB8FTvLJTfF9SbWoEo2JZ34=; b=VSKEaj37wj56DgcMQgxrJVa6jorGo+BRWEDPK8oRDqiAf4V1SCm7JVVitmzj832Ox4 AKNJMcr2LS9tFONBF/pAyLRsxcq5vQNJ2NupiF5I0372HMWk8OgiXeAY7VuabIzkwZJ3 mMOHGhBCFXobANKzbx1kUbfMxZuMo3uJTjW2nminmUEvWA70+1udRHu/Y7N1wjOcK7KN nA0Pu9hd+IX98b9SUJzGxk9/ijuxzOfRNjFNP9OH2pwsMkvoDe9vbBfxqgabPw4QR0Fj CAO0cpG15T0CRAkGjATqJYUXrXts1Z/EHjYad5MWyGnlkOH47h+KOaeMsglxB9Lgn7xx F4Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297510; x=1700902310; 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=y3T+DN+4X901BSZo7/K9QB8FTvLJTfF9SbWoEo2JZ34=; b=iJPtwIjl2/HZQnpPb2yRYrHY26L8F0bF6QT3i21SMuW8Hf3T154uE2vYoIsMO40x29 YUwAEJOCHmKYSQLnfxyv9OPTsmsfCB/wbFY6hPcY5kjfs5ru2YFtnBSKw25zt6azMWeB qkrkbt6d2ZAJpjma0OoJf5wLYU/22ludp1FL4kha0kA4VZk+m7IUFNHlTxDIivNty2Cw wAMIk6cuHAcFulfPclFkbenP8VY+utBXiUreXAB3nXd/uz4oIRIRTY7yU/m7/J2WBx6z AjVih3QP9xWqg9zaR/RVJEku9Qgfre1GPa6ghEsfSCtmmY1PN3FCWD7UXYNZRTUcB8iZ JDLg== X-Gm-Message-State: AOJu0Yz54pHPTsMqWQXlQ5juZujSpSZohs62LkJJwDaf08pfHrgyOVTI g029teLHOP4Z/3HZ43mUOjs= X-Google-Smtp-Source: AGHT+IEsss1sE5P6PCOo9cOkcdRQIbNvEKYz6FnbYDkiPnC/oiwhxvXRu0x7aqyfdT5zy4jYNXXhEw== X-Received: by 2002:a05:6402:797:b0:544:3944:d7cd with SMTP id d23-20020a056402079700b005443944d7cdmr1236784edy.2.1700297510204; Sat, 18 Nov 2023 00:51:50 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id o9-20020a509b09000000b0053deb97e8e6sm1584438edi.28.2023.11.18.00.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:49 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:48 +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 equation to check limits of channel Message-ID: <1f91cf8145b304b09b37734a2a504da394833378.1700296319.git.philipp.g.hortmann@gmail.com> 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" channel_plan is constant COUNTRY_CODE_WORLD_WIDE_13. Remove equation to check limits of channel as those are always in limit. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/d= ot11d.c index d0b7332645be..bb7b5c793b26 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -51,7 +51,7 @@ EXPORT_SYMBOL(dot11d_init); =20 void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee) { - int i, max_chan =3D 14, min_chan =3D 1; + int i; =20 ieee->global_domain =3D false; =20 @@ -59,9 +59,6 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_de= vice *ieee) memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map)); for (i =3D 0; i < channel_array[channel_plan].len; i++) { - if (channel_array[channel_plan].channel[i] < min_chan || - channel_array[channel_plan].channel[i] > max_chan) - break; GET_DOT11D_INFO(ieee)->channel_map[channel_array [channel_plan].channel[i]] =3D 1; } --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 4B989C2BB3F for ; Sat, 18 Nov 2023 08:52:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235036AbjKRIwZ (ORCPT ); Sat, 18 Nov 2023 03:52:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232985AbjKRIwB (ORCPT ); Sat, 18 Nov 2023 03:52:01 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C5C5170F for ; Sat, 18 Nov 2023 00:51:57 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9c6f0530929so74969066b.1 for ; Sat, 18 Nov 2023 00:51:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297516; x=1700902316; darn=vger.kernel.org; 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=6vxxrVa0KzjOY+CRU8JP3B25+gW4kOUQEfZfS215afM=; b=UjoBiRq8XmUkYsEW6cRmgLHHFYFKISMh6kMQnb2SjYgAMcOyzsa23uvDq07bOKF09K gf7h2PbwChUWz67syyzmCDjDTFv+6MapbCkEo4CKy3odYSnHUJkl4YfAw6UFwmV/zmeW WK4NRq6utLVVmEXLgSG/m3Ap41eW9jXulKrXzVmRUjUksjFhWia9ahvJ6FHbhOOdMGIa Dq5BJQmQwW9isA4y53wvUFidCZ6kFNU7+jGKoUgfT6dJrKe0q0fjsn0+4970tNMn9/zK LFkCMpp4DRrfH0MwosmxWv7y9CMZ46xDr/X+I3llD1LdOcAdN9TLaeHKANijzgtlWbly As3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297516; x=1700902316; 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=6vxxrVa0KzjOY+CRU8JP3B25+gW4kOUQEfZfS215afM=; b=uLnp5n6fa2b4b+cAvmTutLI+8q3Kw0sTDGWWxHANdjZwuUj+iKiLewBIGO6kp4+Mmr 62sJLSGTN/Qb8uw2KVSt3p+MC73wMQkXdUJ0aF29OLuo7QdjtNt/KcVsv0di3/UZ2Jkk Nt+24opXgdCmjMK7GMfoKkAIq0c+jHK7OdCzRrAz7JOFXeC0NMSjV7rX+7N0Vxy19omd zIXD3u9XdVViR0VGwJSAxjprr2y7DHVT39YDZWu/ltw24iIai9yKCLKPzhRtgtYIgHRY Yr7u80SAMqcILXBNtF8m4KQ6zDOATm/xR5RQUbfc7IA0NwI38QJjM5cSaySFz1gyDMHq kPJw== X-Gm-Message-State: AOJu0YxTS7Fma8y9tE9vsAO0+NF3IhqpsuLwQzVD58u7VppvhQHnyAVS mK1auqPgResKfVfm1VN4e3g= X-Google-Smtp-Source: AGHT+IFUVtH44rCt4LCqcxa/bLquM61Di/hm60eUMdgP5qLDmyjsQR0cb0wba0hX0lazKaTTYVzrjQ== X-Received: by 2002:a17:906:cb:b0:9be:f78a:d438 with SMTP id 11-20020a17090600cb00b009bef78ad438mr1422200eji.5.1700297516390; Sat, 18 Nov 2023 00:51:56 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id bt23-20020a170906b15700b009cc1227f443sm1672692ejb.104.2023.11.18.00.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:56 -0800 (PST) Date: Sat, 18 Nov 2023 09:51:54 +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 check if channel_array[channel_plan].len != 0 Message-ID: <0cfcc32a06033908c469ef0273de2485dbfd6b82.1700296319.git.philipp.g.hortmann@gmail.com> 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" channel_plan is constant COUNTRY_CODE_WORLD_WIDE_13. Remove equation to check length of array as it is always not 0. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/d= ot11d.c index bb7b5c793b26..b515008045bd 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -55,13 +55,11 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_= device *ieee) =20 ieee->global_domain =3D false; =20 - if (channel_array[channel_plan].len !=3D 0) { - memset(GET_DOT11D_INFO(ieee)->channel_map, 0, - sizeof(GET_DOT11D_INFO(ieee)->channel_map)); - for (i =3D 0; i < channel_array[channel_plan].len; i++) { - GET_DOT11D_INFO(ieee)->channel_map[channel_array - [channel_plan].channel[i]] =3D 1; - } + memset(GET_DOT11D_INFO(ieee)->channel_map, 0, + sizeof(GET_DOT11D_INFO(ieee)->channel_map)); + for (i =3D 0; i < channel_array[channel_plan].len; i++) { + GET_DOT11D_INFO(ieee)->channel_map[channel_array + [channel_plan].channel[i]] =3D 1; } =20 switch (channel_plan) { --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 5C93AC54E76 for ; Sat, 18 Nov 2023 08:52:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233143AbjKRIwi (ORCPT ); Sat, 18 Nov 2023 03:52:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234695AbjKRIwK (ORCPT ); Sat, 18 Nov 2023 03:52:10 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8D1B1BC2 for ; Sat, 18 Nov 2023 00:52:04 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9c40c3814a8so83405466b.0 for ; Sat, 18 Nov 2023 00:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297523; x=1700902323; darn=vger.kernel.org; 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=zMz8/s0f1rrtzmkkOs21rTHNKe3hKx+usDsY/Vx3Y2c=; b=Fha9DYMnpyvw5Qp3D/VxO+DLEGbH/9zlSFfFXHCsjM053+Go/QjIonvIqu/Sbx3uGW tNjwJsmA7geF3+qxEG4ciTbwUX7PaSHXETZ35NJ4HMkkW+4hn6Eg6Xs75Sg28Jl3+X16 91WYyS9s0OiXD26Ac1vjbHvVBzTR4lcCcCYbaxhQMPgMywe96D4a9ke4yfqZWTtd85ig Kg9rsJNDRnV3VFJi2gHGGFS2oDfoYUJOHDf/rlB+a6MiM1Z6CNjcW/7tK/PS3I8qbxut Qp40jhIgOjibqyIi9SSaplmXSl/yGo3Y8HzyreHgIBvsYW3zClcUA7UKc1MtoaRBRr0q lphA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297523; x=1700902323; 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=zMz8/s0f1rrtzmkkOs21rTHNKe3hKx+usDsY/Vx3Y2c=; b=FUhpaNTWq12O2qGLhHKNv59i8gLhBBd9zGyrpCUQ44UTYpKlkYq2OXhJkYDPIXBP+0 Z7zutlIfeUwG20S0w6/toIFYm+7dZ5QJe9euB/7/t5PUjscg6EWizYkz0WODD+XpiW7A 6tHOK/1rqejKQsH+j6q/pNJS1RPojc81MG7FLyPdEpfU/pk6Oc9/gsBYB8+A6GFh5giY BROF38uoppTuneQv1KX03HWeZB+6fAgGH8Nkg5Ex6Pv2orTXXD6wBe41k63jAge/OX3f DphbeDOgUomqMfFq5UTgMaJFYmmyWNoWFLT3aj0K1hOmwGStEIN3fKnYwZrIET62WwcM nzzw== X-Gm-Message-State: AOJu0YxLn073YSaFIW+eRHKeUYLzcKDEWT66DkTzkHLEK+NB0IorRP6s nxwIm11HgnXw8OMb+Bu0Ii8= X-Google-Smtp-Source: AGHT+IHx+v/ZGnNo4+fLMZ/G906LymFhb0eamu67zefP3CIQKl8CBvzEJXfUuBsuYSErr8Vqey8HMw== X-Received: by 2002:aa7:d755:0:b0:547:da7:9c10 with SMTP id a21-20020aa7d755000000b005470da79c10mr1261003eds.2.1700297522916; Sat, 18 Nov 2023 00:52:02 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id g22-20020aa7c856000000b005487d3fb436sm202605edt.90.2023.11.18.00.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:52:02 -0800 (PST) Date: Sat, 18 Nov 2023 09:52:01 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Remove switch for a constant in dot11d_channel_map() 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" Remove switch for a constant in dot11d_channel_map() as the result will always be the same. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/d= ot11d.c index b515008045bd..37106fd54f00 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -62,24 +62,9 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_d= evice *ieee) [channel_plan].channel[i]] =3D 1; } =20 - switch (channel_plan) { - case COUNTRY_CODE_GLOBAL_DOMAIN: - ieee->global_domain =3D true; - for (i =3D 12; i <=3D 14; i++) - GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; - ieee->bss_start_channel =3D 10; - break; - - case COUNTRY_CODE_WORLD_WIDE_13: - for (i =3D 12; i <=3D 13; i++) - GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; - ieee->bss_start_channel =3D 10; - break; - - default: - ieee->bss_start_channel =3D 1; - break; - } + for (i =3D 12; i <=3D 13; i++) + GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; + ieee->bss_start_channel =3D 10; } EXPORT_SYMBOL(dot11d_channel_map); =20 --=20 2.42.0 From nobody Tue Dec 30 07:38:22 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 150ACC54E76 for ; Sat, 18 Nov 2023 08:52:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233039AbjKRIwl (ORCPT ); Sat, 18 Nov 2023 03:52:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233165AbjKRIwP (ORCPT ); Sat, 18 Nov 2023 03:52:15 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8555CD6D for ; Sat, 18 Nov 2023 00:52:11 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9bf60bba6f8so75559966b.0 for ; Sat, 18 Nov 2023 00:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700297530; x=1700902330; darn=vger.kernel.org; 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=gFd2CKAAw+CngGdGEaZh2Jv1ZJmAu581+YDJTtGJesA=; b=a1G6drh3aeMEAESDM4YcZ7g/UMkp1ow0s0vJbIineGzuwp7FCRa6iasVMABZN7h+b/ RDXieB8ORSOUD1ryMHaUSZZOYmIZtNh8S12ACBV4VN7n4HbuJ9m9sa+dIsT7WtaPqbpN M4U58QZwLPpzB9Hkk37lvlA+nJNil/toKRYa6rmFSttpkyq7RisJuVXfLbvnmcd/QR1G wH9nsSwOXd1Ow63agvps4YpcMj40YlRJ4NSgJZFmMtRf60+6aOoMzckY9+RShFjtXhna YcbPO4OduV34mNulh3WcZVmv6ychfY0J1fyP9gDXB4j9dsn21wIrFdYt0luzMDwSZc9D XDug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700297530; x=1700902330; 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=gFd2CKAAw+CngGdGEaZh2Jv1ZJmAu581+YDJTtGJesA=; b=Q97H2/81e8Hw86aKYqQ/RqsiYU7mApxdtWIV0eXme+cWxUzAH2dVAdFbM3scBNqQMO pqSxoC92zz7+nFzeVUWdrvfUsLuQgf92t6tS349MD+CjIULWsx7ZXJMd6z6ict/ohtpN lI/RJQGNjIfp2wcvnHBjAb9CLPAioRvUK0KKuV3SOafMHU63U4tXqRCVKOIJzc5RIbL3 afI4gzV1Uxs9aCkOOktv2T7HCKPlzWxyUMWrNSrk3t+2eQj3nQZu0vmA0mqEQJVaTAqk JuIViwTilv9jhB2+40OwSFYrbeiXHY4RYJAGhWpfwLhcy93L0MUTHghcxf+LP8aX7fqd F8NA== X-Gm-Message-State: AOJu0YyV62Q0xwZtHZxm6Ud95hu31iB/x8JZWg51w022V8Xu0HcwmRT8 l4l8yEu6GMeRDaTESaOXtyM= X-Google-Smtp-Source: AGHT+IGnryVDS7JHAkUlNiTu8DrhaiLJgOXSO9KK2u45C9vEI5TrtF4vuz+BwNel21wX6+3v7eGyCQ== X-Received: by 2002:a17:906:10cf:b0:9cb:b737:e469 with SMTP id v15-20020a17090610cf00b009cbb737e469mr1213341ejv.4.1700297529807; Sat, 18 Nov 2023 00:52:09 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57ba2f20.dip0.t-ipconnect.de. [87.186.47.32]) by smtp.gmail.com with ESMTPSA id r15-20020a1709067fcf00b00985ed2f1584sm1668337ejs.187.2023.11.18.00.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:52:09 -0800 (PST) Date: Sat, 18 Nov 2023 09:52:08 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove constant index from channel_array[] Message-ID: <379293f2b48d176aaafb023d36aac9bb057f67c7.1700296319.git.philipp.g.hortmann@gmail.com> 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" Used index of channel_array[] is always COUNTRY_CODE_WORLD_WIDE_13. Remove index and store only used entry in channel_array. This shortens the code and increases readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 31 +++----------------- drivers/staging/rtl8192e/dot11d.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/d= ot11d.c index 37106fd54f00..fdc39e6e7abb 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -12,28 +12,7 @@ struct channel_list { u8 len; }; =20 -static struct channel_list channel_array[] =3D { - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 36, 40, 44, 48, 52, 56, 60, 64, - 149, 153, 157, 161, 165}, 24}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56, - 60, 64}, 21}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52, - 56, 60, 64}, 22}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52, - 56, 60, 64}, 22}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52, - 56, 60, 64}, 22}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52, - 56, 60, 64}, 22}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, - {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, - 56, 60, 64}, 21} -}; +static struct channel_list channel_array =3D {{1, 2, 3, 4, 5, 6, 7, 8, 9, = 10, 11, 12, 13}, 13}; =20 void dot11d_init(struct rtllib_device *ieee) { @@ -49,7 +28,7 @@ void dot11d_init(struct rtllib_device *ieee) } EXPORT_SYMBOL(dot11d_init); =20 -void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee) +void dot11d_channel_map(struct rtllib_device *ieee) { int i; =20 @@ -57,10 +36,8 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_d= evice *ieee) =20 memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map)); - for (i =3D 0; i < channel_array[channel_plan].len; i++) { - GET_DOT11D_INFO(ieee)->channel_map[channel_array - [channel_plan].channel[i]] =3D 1; - } + for (i =3D 0; i < channel_array.len; i++) + GET_DOT11D_INFO(ieee)->channel_map[channel_array.channel[i]] =3D 1; =20 for (i =3D 12; i <=3D 13; i++) GET_DOT11D_INFO(ieee)->channel_map[i] =3D 2; diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/d= ot11d.h index 6d2b93acfa43..78d1ca1e7743 100644 --- a/drivers/staging/rtl8192e/dot11d.h +++ b/drivers/staging/rtl8192e/dot11d.h @@ -75,7 +75,7 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_devic= e *__ieee_dev) #define UPDATE_CIE_WATCHDOG(__ieee_dev) (++GET_CIE_WATCHDOG(__ieee_dev)) =20 void dot11d_init(struct rtllib_device *dev); -void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee); +void dot11d_channel_map(struct rtllib_device *ieee); void dot11d_reset(struct rtllib_device *dev); void dot11d_update_country(struct rtllib_device *dev, u8 *address, u16 country_len, u8 *country); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 68bd03500267..4b842a1789c2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -796,7 +796,7 @@ static short _rtl92e_get_channel_map(struct net_device = *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 dot11d_init(priv->rtllib); - dot11d_channel_map(COUNTRY_CODE_WORLD_WIDE_13, priv->rtllib); + dot11d_channel_map(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; --=20 2.42.0