From patchwork Sat Nov 18 08:51: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: 166478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1065132vqn; Sat, 18 Nov 2023 00:53:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IENtlWtbOGVzIMLpJVeFZCWrN3AqbfeCk7eVEQbJb5TCZUarpYG8drZBhOcv4rzd62d/I4I X-Received: by 2002:a05:6a00:1a88:b0:6b8:780:94e5 with SMTP id e8-20020a056a001a8800b006b8078094e5mr1569277pfv.18.1700297602735; Sat, 18 Nov 2023 00:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297602; cv=none; d=google.com; s=arc-20160816; b=srauxnRd37fOleC14ZXK1ztzUIF+R4j3P0hxwCeOV8Qk1nzf1eAmdeDHFoAcIjeR6K 5KCa6s21dzlUFkZqxK6SCxhWlj2+j1IpCHGNM0WsEuHILnON3PpFfP4LnTrP5EBerRzP sqGycIR1yn23KyiugZVWJbUgJ88hIC51X9Vbzv5DFX4hHkH1VBNlJR27obM1Ms9Z2kI4 psKjmfqhHT3fT1aMzwTso735ApmW4Ze/mUvXgwp49w8V5T4tZ9r1yzYq/I3b3PyPAWs1 V4sU12dX+DVZb38j/4xMmQRI1yVZ8gVK1RVf1d86VhLgdfPe46h8Mjt9LBPP6IO69Bs+ SLMw== 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=paSTu0WaDDknunnGESBB1JuMqk8D4OMu6cj43zrhMCg=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=ABBnqGPVVrVpcM21q4s1DXmK3eVum0W+/yqidZF1C4HaXaR5IDEBOLZMmxPXkIskzl pcFB1al9mY7/JEmAiKUlw800pwqW45LXqC14pDsisDfC1QacRTg56UBqwyjMSqur5cCV H2+Z8wQK4p7oD5rG1iLWz22M3/Tk7QxzR869zU9PtTUYvif9i3Y9sipgn1Xz8+pAdDIK Owoqramd/gdpSN6XmOB6LRFxRoIpd31Ctq1uE466TZ7Z5jL8XO2bh+SuN/tKvdH1dtL7 P6QnZ5sG98AVUDW19qUMtP5e3iu74Sv5y2vfh2t7aFsJ7/F16wbc9GCwK3KEyRlFzzbE ti1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SSP43ptE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id l64-20020a638843000000b005b7d9aace9dsi3875199pgd.46.2023.11.18.00.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:53:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SSP43ptE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 60E1C808E8E3; Sat, 18 Nov 2023 00:52:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232601AbjKRIvP (ORCPT + 29 others); Sat, 18 Nov 2023 03:51:15 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891258939514835 X-GMAIL-MSGID: 1782891258939514835 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/staging/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(struct net_device *dev) _rtl92e_phy_switch_channel(dev, priv->chan); } -u8 rtl92e_set_channel(struct net_device *dev, u8 channel) +void rtl92e_set_channel(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); 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; switch (priv->rtllib->mode) { case WIRELESS_MODE_B: @@ -688,7 +688,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel) 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 channel) 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 channel) if (priv->up) _rtl92e_phy_switch_channel_work_item(dev); priv->sw_chnl_in_progress = false; - return true; + return; } static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 eRFPath); -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; - u8 (*rf_set_chan)(struct net_device *dev, u8 ch); + void (*rf_set_chan)(struct net_device *dev, u8 ch); struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_COUNT]; From patchwork Sat Nov 18 08:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1064679vqn; Sat, 18 Nov 2023 00:51:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGgxJ3VTYX3RXX75OYCvsinl6ZtYWO9MyYInjGeCYUIXfL6BiPItrRF+A27Dq7eYaueHUW X-Received: by 2002:a25:1844:0:b0:da0:3510:d46b with SMTP id 65-20020a251844000000b00da03510d46bmr1770619yby.52.1700297512585; Sat, 18 Nov 2023 00:51:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297512; cv=none; d=google.com; s=arc-20160816; b=K3lMfIw1Dg/sMeDTpLZ0QUqKsd5vlGKk40C/tQdSLysF06ShIk8T9Gs9sP8FVRZ6HE PEaDTPRBQIaUGgDqOqZ+zIt7iKRDwFqo8B3EF5VqLb/pxDHyT7zZiV+1RcldQrMJhZ9A P6NY+Hihps6cgl5sL9Akri4ru1aUVVhwj3tWSYlYMLnMUwNI5g25O5cUCBLOwLl5K8Ht RqWGsnaF28kx8TiP2eW8n7B4VL4Kxp34BbC87L5yBAGvepwqYvRAILwARqPk4q57xGdr KLx4xBP6U2LeSi6NO8PEgriDDZJqajFqO7pDFGiFGlRtCjQD9wrRzFKr1ufcV34Syoi2 085A== 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=4IeNlXsmBMHoH7xFQOzT7zMDYmFmso5R2YU54hCqJXw=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=a7oe18je96Ja5lZ5rxMxmFB0Yp6/J96JiXpf88Eq/S+CfyQ9TY2xD41bgNAL7xVzge FzUDMmS+OYsfinv+4eJNVSrd8/i0RjYNRxdo+JUBJmxcWCtDEE7Nl+/xo3pFEjkqwuCF c6ZqdCNmo0fTHQhYx6uEEbPXvPZTZLQkDzZYaN7gUVNdWljHNt8EjCXzz8x723Xka12X BuQgZcMZAX/RfMl36iBOS9CcyKPPu/OtJSNw9iL142UhbKKpMUPB2buoEHSH4JPNP+i6 HWfL0h3s/ToYFCcNPwbRVUEbDxHjZN4WHeZfEYG7GmcWWp8JyO8xumFHkfhgdJnJhUaf o5MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UipGlwvt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 24-20020a630c58000000b005ac2af99d30si3876392pgm.705.2023.11.18.00.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:51:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UipGlwvt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 75DA281EB9CE; Sat, 18 Nov 2023 00:51:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232664AbjKRIvZ (ORCPT + 29 others); 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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:51:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891164518673974 X-GMAIL-MSGID: 1782891164518673974 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"); } -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 = rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.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); /* indicate the driver that the link state is changed * for example it may indicate the card is associated now. From patchwork Sat Nov 18 08:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1065124vqn; Sat, 18 Nov 2023 00:53:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGN7yfDCInaNy7aLTW2SkWcz3BCFz/K+dSCn0yAdTsG405794fXqBPt0vZir1ZGL3Ariize X-Received: by 2002:a05:6a20:2446:b0:187:b7eb:944d with SMTP id t6-20020a056a20244600b00187b7eb944dmr2111625pzc.13.1700297601641; Sat, 18 Nov 2023 00:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297601; cv=none; d=google.com; s=arc-20160816; b=uNcL3y5EoV/P4vnJyY7oceipQHCSiMZjS/8MW0wL3D7uaw/r7s3jGtALD4XeGYWBrx V7+BRrUfZrnsjch/yHm09ZK2QTwQy2EkUt1pWeYPtQOoi3cZDdHVIVQ3TpBB84meaeUX 5qch3a6daaqxROcAOIWdcy6JOcX3SE/NcVSsaEwk6pYm2Z5pUYxBsjVDD8tq6iFtk4RE kZoWDuAWsmMxeMJX1iW33Dn4DJ1E4tWbUtMlCo0+TFgixelVoSKuaRpslMQcq7nM8+NV TLe4fsUwBq/3wP9Iwkri7CJyQA/3Oi+a/wyxRF1gefiV2xPnp/AkemmMib605jSdJHFd 8puQ== 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=VjN035WLtuadTMm7LXZaDKsk+/K6gPiiTmDAIdpngNw=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=oCUnzNlVP5xkY5AIJDqPeEuMQVoM77lKI+uoDBU5k52Er1UfBnbXH8PeoYng2mofib TiEoKrv9f/HLXGbT0x7DR1UP0g46u4EJCNUpK9q9jhtvayV9LfoJEW2eWRPQHzMpVKFq WjQVHv53IdkJFf2qhiEw/84ZrvXrwpGkmv1OGYzKG9qlyMfkFltma/sug22dP3bRQZNj qmkSxK0hBxZgopXItznpEaAergoAWHlO8/GuH8qEnjCllRHIlBMzUEkJ8wy4oIwuhooa KJDtqyl8N2y2fpHbIvlC0D3UdP+U/QQe1Z7LPiLkVtWYt+TDqozzBl4Hhg8rbSArVw16 m4fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=G+vdkGch; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id f22-20020a635556000000b00578cc8d2599si3659711pgm.211.2023.11.18.00.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:53:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=G+vdkGch; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 50E9483014BF; Sat, 18 Nov 2023 00:51:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232782AbjKRIvb (ORCPT + 29 others); Sat, 18 Nov 2023 03:51:31 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:51:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891258254884187 X-GMAIL-MSGID: 1782891258254884187 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"); } -static void _rtl92e_set_chan(struct net_device *dev, u8 ch) -{ - struct r8192_priv *priv = rtllib_priv(dev); - - priv->chan = 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 = rtllib_priv(dev); @@ -685,7 +675,7 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); priv->rtllib->softmac_hard_start_xmit = _rtl92e_hard_start_xmit; - priv->rtllib->set_chan = _rtl92e_set_chan; + priv->rtllib->set_chan = rtl92e_set_channel; priv->rtllib->link_change = rtl92e_link_change; priv->rtllib->softmac_data_hard_start_xmit = _rtl92e_hard_data_xmit; priv->rtllib->check_nic_enough_desc = _rtl92e_check_nic_enough_desc; @@ -694,7 +684,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->set_wireless_mode = rtl92e_set_wireless_mode; priv->rtllib->leisure_ps_leave = rtl92e_leisure_ps_leave; priv->rtllib->set_bw_mode_handler = rtl92e_set_bw_mode; - priv->rf_set_chan = rtl92e_set_channel; priv->rtllib->sta_wake_up = rtl92e_hw_wakeup; priv->rtllib->enter_sleep_state = 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; - 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; From patchwork Sat Nov 18 08:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1064804vqn; Sat, 18 Nov 2023 00:52:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyOQskUYmK4rI1J9xO5b+h01KWhvN2n4uW7gOgKOdB/E7oDwmz/viYeTWy/c8rV1qIHFJC X-Received: by 2002:a17:90b:3a87:b0:27c:f48e:e245 with SMTP id om7-20020a17090b3a8700b0027cf48ee245mr1854785pjb.24.1700297541630; Sat, 18 Nov 2023 00:52:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297541; cv=none; d=google.com; s=arc-20160816; b=DJRVA5D3IuGo5OMLbUBD/Wfl2YVX9yB/UWZYzv+TYRD/dWrNMxDb4dTOs+g3cR2DN+ uLe/qLOmwW573p32NBQ3UxPbHo23pbUKU7+NKmcxkDPIWUeoUi3QlSptxP21jvKzjxT1 XO4Q0M2/IM96vQNPOQHiO9M7UpqcSUe2TGR0CjGtY5ozoUn8+HANfyxnR5VBVZlNoRMf avCsLLqd3CC+3yzFa/LI8d5mAzlZI2R4Ctbe2pxZ3WZPxPotKoDI/K9WWvaNbL/c75XC uTGV1Td8/AtlpMRSWaMDV68xFvdI6oBwAetRbV3t3wNCe75czJCiBGd5gXDVFDy7Dxu2 UJ6w== 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=vMytCypAKR6h1wsB0OQEQ+cFMOVYMGL6IbHLXc4UGuE=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=bimxv1gC5Gbwu9bZ0RHs3ovn9TGv/bQcUAXIPC4BTcyehvlhFT/GyEL3P+p3H53k1T mgvebXM37id+8Ut2Sq6JqQiZyzcWZ+FePPGJmiMw7+UGeLE/gsWOYLN4xI4E+BNoA7tV EcF5aW7DVdjVB+y8+SE8e7bZ2Tzjkn1eyDGDkyIpMT1s/WW5dYNVRl7V4ZVOZH73GhdI kmJacxDPn87TV6ZNh50qRZkAHi73yP4SBR6Ysu5fW+mmN05UpKEhhv5YMyzmOg02XVsx fmYGykk9W6oSMEkWbc9+l8pnr798VacWLAF6XVUOL/GS9T1GvNtx183tJCJa9VEldwgb QkZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QOp7DghV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id ob14-20020a17090b390e00b00283a0cb5b9bsi2304979pjb.58.2023.11.18.00.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:52:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QOp7DghV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 9E3ED821C5C4; Sat, 18 Nov 2023 00:52:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233067AbjKRIvm (ORCPT + 29 others); Sat, 18 Nov 2023 03:51:42 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891194880247920 X-GMAIL-MSGID: 1782891194880247920 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/staging/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_device *dev) rtl92e_init_adaptive_rate(dev); - priv->chnl_plan = priv->eeprom_chnl_plan; - switch (priv->eeprom_customer_id) { case EEPROM_CID_NetCore: priv->customer_id = RT_CID_819X_NETCORE; break; case EEPROM_CID_TOSHIBA: priv->customer_id = RT_CID_TOSHIBA; - if (priv->eeprom_chnl_plan & 0x80) - priv->chnl_plan = priv->eeprom_chnl_plan & 0x7f; - else - priv->chnl_plan = 0x0; break; } - if (priv->chnl_plan > CHANNEL_PLAN_LEN - 1) - priv->chnl_plan = 0; priv->chnl_plan = COUNTRY_CODE_WORLD_WIDE_13; if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) From patchwork Sat Nov 18 08:51:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1065134vqn; Sat, 18 Nov 2023 00:53:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIsN9w+dmmGszorxWyOy2R/m+fVV+y9kWjFWqmQpwfC8lnjdQrGMqeI+ByhfAd3LoE/K9J X-Received: by 2002:a05:6a20:d907:b0:187:703a:8658 with SMTP id jd7-20020a056a20d90700b00187703a8658mr1808076pzb.59.1700297602948; Sat, 18 Nov 2023 00:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297602; cv=none; d=google.com; s=arc-20160816; b=Qsj1uIjL/ztFm2LKXwZFaHsB+Jujzxn6h5i+aUUUD+ymXn5hufIRCCGdGLFixb7xA3 Ey75mNU4fRBXs//EkPHaoSZnCUTTHTylqOFmLlDkUjiMI41Swy6ugp2adVr/3do57BBt mocaPKzCVACYiJ6EsXuC/TcL0dSRQAyqVdHdOK4ubDfTqmUtYhd2Z2LLtj5XYcdj9oqB wDIiouNPbP9ABTpF/azvH5ykvLlmHA1kYpTM2eJVkno4lmaTNEuKIAN69DRaqh5+QHh+ ko09VVctabmRsHoddRHSkCrqm9AAgp0kPuq2EY17LKw8pWRvyJ8v3F9kkeOr6KiAfVlq QMfw== 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=fFLHsxGK7k/8eykGJrZMJGzqZ9wJ0aqJSpq01GUYpM8=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=aGp+O3J22Ca2gP1E054BAwD/Cb4YozJTIhTaNI/luh7GOvS/u6+svg/WJ1CBs0QQ5F s4nYHiiDkcTmuKtr9Sj/rRt9A/v50nWeUfA2mzHnYpgD3W7r5whPmX3MIbtMghjQyp5+ ZMI7DlvXyY+kVHOstyOg30GqgQuzt5xeC+yPuRxvmjKI3nPo4W9AOznoQSrWwakoaxDM Y0kH9oGxZE7lEiS1vevy7qVDR+o6Kns67moQnowjF9pVwL9WPkq9v/bpsawBP/2wfQAg B+uofOpZVYYBvSyqX5HtK2PvrZpJFAiMrK9+e/pqnzBTqKtYHbSVv+5lFtjsawBvATMe P0oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LGr98wLg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id n14-20020a170903110e00b001c9d690baa4si3948426plh.532.2023.11.18.00.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:53:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LGr98wLg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 89DAE809B777; Sat, 18 Nov 2023 00:52:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233204AbjKRIv5 (ORCPT + 29 others); Sat, 18 Nov 2023 03:51:57 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891259021913555 X-GMAIL-MSGID: 1782891259021913555 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/staging/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; } - priv->chnl_plan = COUNTRY_CODE_WORLD_WIDE_13; - if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) priv->rtllib->bSupportRemoteWakeUp = 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) struct r8192_priv *priv = rtllib_priv(dev); - if (priv->chnl_plan >= COUNTRY_CODE_MAX) { - netdev_info(dev, - "rtl819x_init:Error channel plan! Set to default.\n"); - priv->chnl_plan = 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 = 1; i <= 11; i++) (priv->rtllib->active_channel_map)[i] = 1; (priv->rtllib->active_channel_map)[12] = 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 { bool tx_pwr_data_read_from_eeprom; - u16 chnl_plan; u8 hw_rf_off_action; bool rf_change_in_progress; From patchwork Sat Nov 18 08:51:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166479 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1065147vqn; Sat, 18 Nov 2023 00:53:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IFRsIH3cTBANLyeftYJYSRlsj3vOxHoslGUmmm37LKMLX7K0RBUi6zUQiSl01qDzsHAuf9R X-Received: by 2002:a05:6871:e7c7:b0:1e9:bda0:774 with SMTP id qc7-20020a056871e7c700b001e9bda00774mr2110251oac.25.1700297604465; Sat, 18 Nov 2023 00:53:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297604; cv=none; d=google.com; s=arc-20160816; b=Q5DuZGBmBHgbLVxB43EqWS7Q/WrvECXl29GZ950/+3rRb/P1vwcKWk993fFtBjhtgY PKXR2pDe+E5pBEUtwE5MThd5Tewvti/lHy/EmgBm/OI9GkbOYgeqHK6Tnq7CKxypcntN 6WW+ixJfj35KSvd2l6hOgpa7oAoc1mkpsyY0EA9/FcKXEOu04vYXSw+Is6LFGuPTlalQ /3LlEyJ0S+zH1JCEjyPsEueQHWUeXeej28ne7WNG6/yWTjKlbahPhWO1bR8BUsw3GHf7 ekPWeTv5ZToKBsIRAgErY6tFeDTP5uRpH7hmX2iHl1Yjj4BefCUQgF93QAR5YpBup+cU zcmA== 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=60TEIsDbZcJztid9/FBNOOfGZ+ibynkio00841tSlME=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=OfowqLZYXzKHZ9EOQsT6O/OeFKwf3WJl+2rtRSbGkpVqcbB4hMWO4VhAxRIuJsxDok GC+2Ux3/mzTzyDMDkDtf7iPI5BWhQuuznmccWB9ozR0bd3ZfRSQ84iJyh+ywYsmmGYye d9x30xAP/WqoNneZoSp4foRivEu1BwBoSFq+W8iJVjJFfPT00VK1hAi6JV1nnp5oDo2b x9ppWZkO7EROlq2XxftKaX7sF6fR1hmOdxs7v6Y7KbpE+ieL49A6RfF++XNlwF+nWztY wCr5vjSB2N59Scl8qCTBsTNmUAg/bgtetBaFozxttGJXM/o7+tt/9x0d3+EC5VfvKhdj SSdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bGkjW9qO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id q21-20020a635c15000000b005bd11902100si3264807pgb.840.2023.11.18.00.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:53:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bGkjW9qO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9FAA48089E4B; Sat, 18 Nov 2023 00:52:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233144AbjKRIwN (ORCPT + 29 others); Sat, 18 Nov 2023 03:52:13 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891260651207856 X-GMAIL-MSGID: 1782891260651207856 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/staging/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 = usValue & 0xff; usValue = rtl92e_eeprom_read(dev, EEPROM_ICVersion_ChannelPlan >> 1); - priv->eeprom_chnl_plan = usValue & 0xff; IC_Version = (usValue & 0xff00) >> 8; ICVer8192 = IC_Version & 0xf; @@ -283,7 +282,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->eeprom_vid = 0; priv->eeprom_did = 0; priv->eeprom_customer_id = 0; - priv->eeprom_chnl_plan = 0; } 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; u8 eeprom_tx_pwr_level_cck[14]; u8 eeprom_tx_pwr_level_ofdm24g[14]; From patchwork Sat Nov 18 08:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1064968vqn; Sat, 18 Nov 2023 00:52:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQIp7/6gWIGTCvDqwqkIyRqUuu4LuO6Kq7854q4qdkNuRYI4N/7R+YBymYZ4tXKcMCkAaD X-Received: by 2002:a05:6a21:6da2:b0:152:4615:cb9d with SMTP id wl34-20020a056a216da200b001524615cb9dmr11886793pzb.12.1700297572264; Sat, 18 Nov 2023 00:52:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297572; cv=none; d=google.com; s=arc-20160816; b=cI7LN+AjbndsYg6iEbhRZY2jz0T3pyr3R0Q+398sn5vQTzqz38yyKLoDE3J6x+IVLj 1YzVgqXuSBlTLClwzpiBF2sAhiD1P0dj/kT48u4wREYPQvvq5Kp5DJUR4C+V40wg4ju2 ArOke4xKwjhGF3Ix3S+SChBpVh3mmngidsrvOt7p1UbUkOYC8wdSIJ0P8sBeIfrc6PvS ghAJISP2/YQUtJxEdj2Y7MjFKOwNste124Y/e4GlN4l6Htk5o3bjrzNzPgwdbc5vcaQO 5K+HcJiYaO1BUE4kQBr9iY0tODz17vjtNx+ZSjMK5obOR3vdRc3/XlYoDtAmkpYEh6hY 7Kmg== 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=y3T+DN+4X901BSZo7/K9QB8FTvLJTfF9SbWoEo2JZ34=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=0QSS8VZb9EBKYvgakMQNFviZqz63Zg0GC0O/g/KLehcPzkPKOuljX5YRD/pysdFfRO mNPON3IdmHucC+14gx064/8t5YOxvakdBX6pSmhOZ9TjHYDyQcJbk2ZVHrjUZ+wRVF+5 y3/dJrKgQNTlry/N7i+4ho/9KFUAlqwgJtW+mnCUtl0HzWBAAKR+gAEpLRqrvKAXqKp8 Y+m1FCxOd2j2j16S4HTr/1f6vhrFcuEdk6cp14p8rRQ4huOg54YdBVPXCnwL+LoxiM0S qK4kc72TPJRSSpdmMXr7PxL+ocLAJ4ZUhBmYU24w3YN6VxQfdM+3Frg7btB5HFtp8ssg xjFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VSKEaj37; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id l22-20020a656816000000b005c200b11630si3667627pgt.45.2023.11.18.00.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:52:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VSKEaj37; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 02A76821C5D1; Sat, 18 Nov 2023 00:52:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232760AbjKRIwR (ORCPT + 29 others); Sat, 18 Nov 2023 03:52:17 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:49 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891226944368257 X-GMAIL-MSGID: 1782891226944368257 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/dot11d.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); void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee) { - int i, max_chan = 14, min_chan = 1; + int i; ieee->global_domain = false; @@ -59,9 +59,6 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee) memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map)); for (i = 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]] = 1; } From patchwork Sat Nov 18 08:52:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 166475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1064971vqn; Sat, 18 Nov 2023 00:52:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFy5GlaQ7jE9pF+03d84TNiTyrFmCRdT0GBFULtpQ+7m6SCeDbSa0nF2iLNk3F5ZuwT/ez1 X-Received: by 2002:a05:620a:1d05:b0:77b:9a8c:b0b5 with SMTP id dl5-20020a05620a1d0500b0077b9a8cb0b5mr2183806qkb.57.1700297573518; Sat, 18 Nov 2023 00:52:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700297573; cv=none; d=google.com; s=arc-20160816; b=dhz7SGoUVpefXxU6cHg5H5XqieaS7gVMmpi5+XsTpcEb5PQ0BWIkSIe8BGpLpgA1po H9ETFDrOgV90TlQaCrJnhgBSu4dg/HHiNuHMMdDzyrf1ppFwoA7okWRtklwIgogVD6et TN69YvHQ2BOt3XsUBcWiH8Ug6ayI5J5yn7EKFfLNXPsGrIYXJXmi81NJYRqgAbuVhvT6 hcNf3tXKL9D6kjRLL0pZDighrb/dx/ljdT7nefxvcBHjaCjRQVHX87hRJ5XZbhZxxYy1 rjN48LbShy2X2vNMVEB3qTco8pqpcqeLjx7M3lC/zNOXkh+ggekj/YgwfDxD3koSAe2G x1IQ== 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=zMz8/s0f1rrtzmkkOs21rTHNKe3hKx+usDsY/Vx3Y2c=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=iV1dKbgpgUdZcEX5pXSg4cZVeVJP1KkMKaIPecbb1qUgJNfjuQ04pJatAgWPeTjn1H YbMv4J6b73R5DzPsCn0D33dDDNUIqNIxaZePAQOsnq0USA/nwp1h34pRYchLcQW8DiUt DKomaS458MtFkH1BZTgAYiSKqgi3eSZ2QQOsJ3OqNUivgJjWor+tF/5HxMDQdFW5s3F6 Sli3qRaY7ekTDT7dDQryMYiQqsFFaXSJOIF1ceJh9uRUQaQ2os3Unl1RIMEqUf2AyZcJ 2RvQSyCb9s0CEhWnibCWq/fYBXrYhvZxn4PCDF8JyvfI6u2h7JH5JouGdsG4AF/378tw LjxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fha9DYMn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id o15-20020a634e4f000000b005c2188ccb4asi1920065pgl.698.2023.11.18.00.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 00:52:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fha9DYMn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5AB74820BCAC; Sat, 18 Nov 2023 00:52:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232920AbjKRIwf (ORCPT + 29 others); Sat, 18 Nov 2023 03:52:35 -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-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: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 00:52:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782891228486157107 X-GMAIL-MSGID: 1782891228486157107 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/dot11d.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_device *ieee) [channel_plan].channel[i]] = 1; } - switch (channel_plan) { - case COUNTRY_CODE_GLOBAL_DOMAIN: - ieee->global_domain = true; - for (i = 12; i <= 14; i++) - GET_DOT11D_INFO(ieee)->channel_map[i] = 2; - ieee->bss_start_channel = 10; - break; - - case COUNTRY_CODE_WORLD_WIDE_13: - for (i = 12; i <= 13; i++) - GET_DOT11D_INFO(ieee)->channel_map[i] = 2; - ieee->bss_start_channel = 10; - break; - - default: - ieee->bss_start_channel = 1; - break; - } + for (i = 12; i <= 13; i++) + GET_DOT11D_INFO(ieee)->channel_map[i] = 2; + ieee->bss_start_channel = 10; } EXPORT_SYMBOL(dot11d_channel_map);