From nobody Tue Dec 16 11:48:20 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 C7564C25B67 for ; Thu, 26 Oct 2023 05:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343929AbjJZFns (ORCPT ); Thu, 26 Oct 2023 01:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234338AbjJZFnk (ORCPT ); Thu, 26 Oct 2023 01:43:40 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7849B1AB for ; Wed, 25 Oct 2023 22:43:37 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9bf60bba6f8so14845866b.0 for ; Wed, 25 Oct 2023 22:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299016; x=1698903816; 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=vZtVCTK7d+6aSVA0zIPbMt/ewE8ripYxAkjP40CJ1l0=; b=T2+lmq0WW77RllGCVixKd40vsza1SLQC5dOhiupIstYZkdfQY3BFMWdf0uMpFbSitp Vsy0UdXK/jDcv3vyAiO6WI6FWLHXyljzlggmRjWhWwaugP2wn5J5CZvOrfDUuP92IcZX fZcYs2BCO1N+GztmmF00klsCYFN91K/y93eU9Gumg2e0uBVTd7WcL3KZiaG5yfNdqWlz SyVZ1BZomiR6uOrK0ebZkQQyNmJQ44oEUybbIBmns3cu41Or+RDr6kA0O2Hq+5d7bQ8L aqR4CUS5Q67DUOk2mo5ZflMq//Dh+l07uB8YDAboLWMsns+aEwTQB3TiUPCULtDCPDah b5DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299016; x=1698903816; 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=vZtVCTK7d+6aSVA0zIPbMt/ewE8ripYxAkjP40CJ1l0=; b=OamNEoPV8mFUDULSn1SGAZyyosrUm3Zgu7Ot/iZdUnHrro2BaZbz/qp5WjGYwyR4RP 4zj5wFbVqXeCOVaJvCOsZRwU2jcigOS8Bx+joww8rz/GiOcz7A6tbC0aP7S1zoVAWtUQ zp9HeAYTmtkr2i5HunmjIbbJzxzv05vhcMng2drtebKbNCxw6hChQpOI0trgf/dVA5tK YfHUvlR8Mr1zG832pCVkrDfceKkiPoyH47yu+iUSgpwTotiBot83e9GbxYyGdfxUq+vA YjbRaRbjhn8mAtD0JH0+UXQ3ffLeoC3hr0QeTzRROCpCOgnNxzIOMmLcsyJ2g+rJwFX9 kZVg== X-Gm-Message-State: AOJu0Yw2ydSlg+Izv/5u3SyooYOeF4lpr5uZCGZ47jXPi6Z4SngQviaT GuZn+sedLJetbjPWnGJpHDk= X-Google-Smtp-Source: AGHT+IEuJRMJgaGaNRyyTxMHSBFN4+cCZOwoVzmjfcPTxqkb3D7NfOhx2aZT0HmZgAsO0Zlo0u0DIA== X-Received: by 2002:a17:906:cb:b0:9b2:bf2d:6b66 with SMTP id 11-20020a17090600cb00b009b2bf2d6b66mr11779782eji.7.1698299015576; Wed, 25 Oct 2023 22:43:35 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id gx13-20020a1709068a4d00b009ae6a6451fdsm10964024ejc.35.2023.10.25.22.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:43:34 -0700 (PDT) Date: Thu, 26 Oct 2023 07:43:33 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Remove HTIOTActIsDisableMCS14() Message-ID: <7ff3c7f8daf9bccb004129fdc1128ca0b0cb4e70.1698295861.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 HTIOTActIsDisableMCS14() as it always returns zero which leads to one evaluation that is always false. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 00b21542ddc3..18659408bb69 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -207,11 +207,6 @@ static void HTIOTPeerDetermine(struct rtllib_device *i= eee) netdev_dbg(ieee->dev, "IOTPEER: %x\n", ht_info->IOTPeer); } =20 -static u8 HTIOTActIsDisableMCS14(struct rtllib_device *ieee, u8 *PeerMacAd= dr) -{ - return 0; -} - static bool HTIOTActIsDisableMCS15(struct rtllib_device *ieee) { return false; @@ -696,10 +691,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devic= e *ieee, HTIOTPeerDetermine(ieee); =20 ht_info->iot_action =3D 0; - bIOTAction =3D HTIOTActIsDisableMCS14(ieee, pNetwork->bssid); - if (bIOTAction) - ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_MCS14; - bIOTAction =3D HTIOTActIsDisableMCS15(ieee); if (bIOTAction) ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_MCS15; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 0EDA3C25B67 for ; Thu, 26 Oct 2023 05:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343804AbjJZFn6 (ORCPT ); Thu, 26 Oct 2023 01:43:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344023AbjJZFnp (ORCPT ); Thu, 26 Oct 2023 01:43:45 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D0B01BD for ; Wed, 25 Oct 2023 22:43:42 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-53142351997so129034a12.1 for ; Wed, 25 Oct 2023 22:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299021; x=1698903821; 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=PxIUWq0JvE8ZN9IeEN1TvTq6KPJTuoCETYsX6YOkfb8=; b=c2/vbcmXPgpO7FiDzvVKXPVvoVGl9pyy9+kvdgF8LWVOk9aOKjFAyFIZbagzSdXq4w pT5cS+NRI1j+UhsDIO29jxQ22ESQHNm4D/cpjGtiZKL9Rb0zov8CgzuXgMAFZ/8Ycz+u AHwzQJ3FWTERWQut5dTXUwLqOp875qwlFM12MyvmVwiMrV7uhIxumfMXUN04i7wdE4dl akawUvHWki86k92juF0h7RqJnYdk7jP3rL260jNI1Xi2J1HaNZJdRXJc4hId5J1rlbRy z0d+0WVVOCxcShX6ZdQIRx4GhqC6kMULhfT40FnXYBLTpJPxkVgKElTmLeqMOGGoCZl0 hVTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299021; x=1698903821; 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=PxIUWq0JvE8ZN9IeEN1TvTq6KPJTuoCETYsX6YOkfb8=; b=tFwqB91T62GR6igt2PfSdYeCSX7ZXXP20Dan3MNQsuYeVVapVROHrjGVNLBKcqRAaq pCplNXd9rw6/LfpFS7JiH5MEDDFQoZS+rKeiKwWjJsdOWVfRb9BP9I9EiNJYzomalRgW IqCdhbS8Hp1bmRdsvoxsBN4nES6qgJ1QD3706wnH6E/TH6lhIRojh0mrxaTpgjLIRjwl gAIo/eCJthOO39OxnhfFcJhVkpVNHD/d17N4abTja+ij8mAznwOH4n2LLyYKzjRoTYs0 W2nvwv63MY7mFFnH8NmVQTcnBmZAFRImD55CTUaCFaj7SkOKZ7YiP6Am5dOF63d+sF0H mUKA== X-Gm-Message-State: AOJu0YzFR3O3QUPeHqQUu3xYLiyV3rIfdw5odJYA/yuM8A9y9oryn5aH 4Atk+ddjS5y4a9fLPALgIqQ= X-Google-Smtp-Source: AGHT+IEXiEKKpAMjTDrlioaK4ZFLi8ap0p6z3kKOWh0+t/48Y6ZojiTkv9gIaBG6ovvw9JNrx1vQGw== X-Received: by 2002:a50:d4de:0:b0:52f:bedf:8ef1 with SMTP id e30-20020a50d4de000000b0052fbedf8ef1mr12268337edj.3.1698299020782; Wed, 25 Oct 2023 22:43:40 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id q20-20020a056402033400b0053dd8898f75sm10495724edw.81.2023.10.25.22.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:43:40 -0700 (PDT) Date: Thu, 26 Oct 2023 07:43:39 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Remove HTIOTActIsDisableMCS15() Message-ID: <004b43b098f14f82e9614578ea9f04ca95b48b4c.1698295861.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 HTIOTActIsDisableMCS15() as it always returns false which leads to one evaluation that is always false. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 18659408bb69..ea01cfce77d8 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -207,11 +207,6 @@ static void HTIOTPeerDetermine(struct rtllib_device *i= eee) netdev_dbg(ieee->dev, "IOTPEER: %x\n", ht_info->IOTPeer); } =20 -static bool HTIOTActIsDisableMCS15(struct rtllib_device *ieee) -{ - return false; -} - static bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device *iee= e) { return false; @@ -691,10 +686,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devic= e *ieee, HTIOTPeerDetermine(ieee); =20 ht_info->iot_action =3D 0; - bIOTAction =3D HTIOTActIsDisableMCS15(ieee); - if (bIOTAction) - ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_MCS15; - bIOTAction =3D HTIOTActIsDisableMCSTwoSpatialStream(ieee); if (bIOTAction) ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_ALL_2SS; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 4944AC25B67 for ; Thu, 26 Oct 2023 05:44:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344090AbjJZFoB (ORCPT ); Thu, 26 Oct 2023 01:44:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344159AbjJZFnx (ORCPT ); Thu, 26 Oct 2023 01:43:53 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1646196 for ; Wed, 25 Oct 2023 22:43:49 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9c14313eb1cso12794166b.0 for ; Wed, 25 Oct 2023 22:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299028; x=1698903828; 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=88V44OaMqzEfkeGrh8z6B90RbiCDqgJggaF2dntJGPk=; b=K8wf96H4LRc6QjOiLRrG6e9mvnzp4xVJeLv/171VS7PHbHd4utsTJvlQQL+oSYe/qX MmI+9jAvaIktuhwyQtNUXoAVCdVqhyhA+/JD7TfdW8SeQ0p1jXKVksVyMM990oCRGHSk Qa1q9OEoOi1nKmTr7LLBX4z/w8s3ZCC8Pb+hE/xqk6ikHuLvtd0JIZf2iV/tRx5EW/RM i1ByMcOCYQRGGzvGGeFT9UpxKzQcnJrcTXmbGygBSauT+AMJKDe1BdV+aGDTT7kRaswg tHqars/5r9VE0WMm/po4yWoR8YTPpUHto4S23ZAkYdOgdXneT/u9jB7B0kS0+syJ8r6X zGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299028; x=1698903828; 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=88V44OaMqzEfkeGrh8z6B90RbiCDqgJggaF2dntJGPk=; b=FLXIX3/vdMykXP3sOywb6mManNa68NeacL3i+L26XfPOBYQ02QQYM0CJY2hB402/nz N+8mvzRaNAvCsSoy2yCAPLloNT1TTnH1dw4MMn7Uym8UGqosABLcKp1QOpqhNKG6c1R9 wn6DxtEfdRdXq0Hg4S5+EJg6jyfpHQli8M7CWcEbQK6lcQHrEdFzw1pfnEisvfQvUdAs PUVzE6anJ6Xl5nxNklce0Bz1SRzXBYXiPu/sfQF9SonUmH/J1LMJ9jeiQE8ZULid6qyj dNHXCdLglwL3hPIK4hOC1Z+Qiz3OSzZ/F9WlGRAaW7ON6afPhGzMfBseWrW0xERdZWFX 3Tcw== X-Gm-Message-State: AOJu0Yw1LCB74gRGCRhZMaZ3/tj5w4mMEKKWm/PnQnmViryCV52eAP+Y yEvqTkuadDdi4pzFMqJLw70= X-Google-Smtp-Source: AGHT+IEh+u4jpdjbIJqbo2Ldz4i9wPwoXV0a9R2mNz6qXxFITxd6hw61qP7e1ejbDjR3G/RPhadrMA== X-Received: by 2002:a17:906:ac7:b0:9cb:b7d3:bcf0 with SMTP id z7-20020a1709060ac700b009cbb7d3bcf0mr5815415ejf.1.1698299027935; Wed, 25 Oct 2023 22:43:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id t11-20020a1709066bcb00b009be14e5cd54sm10978154ejs.57.2023.10.25.22.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:43:47 -0700 (PDT) Date: Thu, 26 Oct 2023 07:43:46 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove HTIOTActIsDisableMCSTwoSpatialStream() 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 HTIOTActIsDisableMCSTwoSpatialStream() as it always returns false which leads to one evaluation that is always false. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index ea01cfce77d8..3cbadd6a0aef 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -207,11 +207,6 @@ static void HTIOTPeerDetermine(struct rtllib_device *i= eee) netdev_dbg(ieee->dev, "IOTPEER: %x\n", ht_info->IOTPeer); } =20 -static bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device *iee= e) -{ - return false; -} - static u8 HTIOTActIsDisableEDCATurbo(struct rtllib_device *ieee, u8 *PeerMacAddr) { @@ -686,10 +681,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devic= e *ieee, HTIOTPeerDetermine(ieee); =20 ht_info->iot_action =3D 0; - bIOTAction =3D HTIOTActIsDisableMCSTwoSpatialStream(ieee); - if (bIOTAction) - ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_ALL_2SS; - bIOTAction =3D HTIOTActIsDisableEDCATurbo(ieee, pNetwork->bssid); if (bIOTAction) ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 0F479C25B48 for ; Thu, 26 Oct 2023 05:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbjJZFoG (ORCPT ); Thu, 26 Oct 2023 01:44:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343915AbjJZFn7 (ORCPT ); Thu, 26 Oct 2023 01:43:59 -0400 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 9FBC4192 for ; Wed, 25 Oct 2023 22:43:55 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9cc6c92d1e9so14158266b.1 for ; Wed, 25 Oct 2023 22:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299034; x=1698903834; 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=5wSndwTs4wiNAVHEpPnvhlAlU5Xl5PBQkAHjBg9fFq4=; b=NSwEvlMBC59w/uNvoXU5LSjTSDgmsIRCMzhO7DNvtUiBF7IX7irMmVhXcm01/gYQkD G4RcJCAGeVSU5IW5GAMK1eXPOCMPTy5oPxT6YF7nTsrbG8DQboJzIFw0Dfw0Jriv+sug nOfwT4oy+3iTIqigASFZ9CLJSL5NbafXpbb86gtMuZuwMsqOChaCaOeDIlNuzBnn9Ryg QiHZWML175PaHlAbWqtX2zAKy0vDy9SdPBoQSNyDTQw76NHvtP3C1rpKTekbb4BwGkyh tNydGxXLZV2mBWYl8QhZWDUId1BZ13z5mYzzletdAIx6qxYbX2B3yvvwkaAGIoxDyczG QWkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299034; x=1698903834; 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=5wSndwTs4wiNAVHEpPnvhlAlU5Xl5PBQkAHjBg9fFq4=; b=wZam6GstlyYeS1hLtI/LTrMqznBKwkAeH4WdnRAP8nBounCeE6vLL70uP31r58y7Q1 CRpy3lFUizzvXH1hUCcytEWwV1UQkR2LeRgFH7Dck+/DT0fXHlSLGy7DlN5zXh8iDUaq OQwJM4Bkp8glJ4cyAKsgGq6g+SvSywdqhxC03kVavnbiVr3hhOeaAVeRyDaXjBQb5tk2 vNbT+rgWhCz0PqpFPN6OrcRLdlpc4VPj8xxGygYWwz23jfllBTQ6cKQTa4fe6R4iUiNe Gfsl8EsfUcchVe1eCOM4ulU1w21ZkIaC3k2rEJxjBwk5VsVuYieSw3nWcDCVsj6FE4Ed cI1g== X-Gm-Message-State: AOJu0Yxdm2/0TH2wda5LyYW20t4Row2UCXm49SwmbxjS/cGZZQumnUo4 UQ1e7h5svvtX6+LWvnNIYUAK3IR0dmQ= X-Google-Smtp-Source: AGHT+IEe+xOHM3zlfZ8mNcB/5o4ogMmrnmdS0Fh0YR9k8gUEIMdrwfRwVljfLqBwQFHFCiANPCFG2w== X-Received: by 2002:a17:906:5198:b0:9be:4cf4:d62e with SMTP id y24-20020a170906519800b009be4cf4d62emr6373890ejk.5.1698299033757; Wed, 25 Oct 2023 22:43:53 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id do6-20020a170906c10600b009ad7fc17b2asm11101621ejc.224.2023.10.25.22.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:43:53 -0700 (PDT) Date: Thu, 26 Oct 2023 07:43:52 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Remove HTIOTActIsDisableEDCATurbo() Message-ID: <904ca224c6a0a1968012e131c0197a71e5b67f81.1698295861.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 HTIOTActIsDisableEDCATurbo() as it always returns false which leads to one evaluation that is always false. Remove dead code. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 3cbadd6a0aef..e607bccc079a 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -207,12 +207,6 @@ static void HTIOTPeerDetermine(struct rtllib_device *i= eee) netdev_dbg(ieee->dev, "IOTPEER: %x\n", ht_info->IOTPeer); } =20 -static u8 HTIOTActIsDisableEDCATurbo(struct rtllib_device *ieee, - u8 *PeerMacAddr) -{ - return false; -} - static u8 HTIOTActIsMgntUseCCK6M(struct rtllib_device *ieee, struct rtllib_network *network) { @@ -681,10 +675,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devic= e *ieee, HTIOTPeerDetermine(ieee); =20 ht_info->iot_action =3D 0; - bIOTAction =3D HTIOTActIsDisableEDCATurbo(ieee, pNetwork->bssid); - if (bIOTAction) - ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; - bIOTAction =3D HTIOTActIsMgntUseCCK6M(ieee, pNetwork); if (bIOTAction) ht_info->iot_action |=3D HT_IOT_ACT_MGNT_USE_CCK_6M; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 22BB9C25B67 for ; Thu, 26 Oct 2023 05:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344380AbjJZFol (ORCPT ); Thu, 26 Oct 2023 01:44:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344280AbjJZFoG (ORCPT ); Thu, 26 Oct 2023 01:44:06 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E066419B for ; Wed, 25 Oct 2023 22:44:02 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9bfbc393dfaso12039666b.1 for ; Wed, 25 Oct 2023 22:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299041; x=1698903841; 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=avBMhTQILI4e6+6heKlFl4WenhKlgtCr5qfdN9CAMvo=; b=A9sgZmAcVOe40V3fI2znJzna6yxZr4zSrxjV/i3KkiN130cAlArb6jJzKBESXgNeid YM+uYToNo/L7G2DUXBOPRkA1qt8pguO4uyl1SKaojNgZZtuFiV+1eBZMgnEeYQn1I2Ay VLPIE7vjD+ZdKhYDwUEE6X9s2qUrN7f3R3P67TFo0NSCZiR4Lu51T3Bvmz13m9NmKy3F m+7ysw0EyznXoIiD97YC0yEu+7pUoa5EJ2IwX5PzcyWdp+0XTTFp4G3i6JrOwLDQydiY bhR8S2gy/lewlCKOR1b8SZnJ1yGmFCGucK5muq5u9VZTpN3ttVbSZLDuKDIdcPgoXlsW FTGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299041; x=1698903841; 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=avBMhTQILI4e6+6heKlFl4WenhKlgtCr5qfdN9CAMvo=; b=LVGBcifnfZr9QgSjVmFVlp7aFFxDgedibTib5D2TEZBfSa/G1du4qkYPByl80AIwin S3BGj98YQG2gSouY/QQosQIYXEMmQ4rH3FY2HZp2LpUwMCyxB22zT23YOhMIgnucFz8/ cMV628lc7dXeRmzVqU/Mi7unYdHd/NLK33NcGkiF/G//+ylyMSfld+R546PCVCGHe+g8 Ji7L+6aXmf7kA8KD/eXE6LU4APKfKwYzqutlIaC52sjqPgBPspruoktzIQTcu/Muyw5R z/tYeYZNNtkg5Bmk3nlk20xKwp0vV1PrKTOZyefm1KJGSoyGxVV7pjPdfBUrL6mfaVVu qIYw== X-Gm-Message-State: AOJu0YwF4UX8pTRaQTSXMRfuW9RSx6wk+MpfnFk24HLa2P2ePB0jKyYA ljmhupN39xJsFgcFnjMJFPM= X-Google-Smtp-Source: AGHT+IEEzgom6mUp2yUfo9xYoRFpn+T5Mb10i99mbJrjpR95Hr8MtlWpnJhzqpwT1m9pnoOxb/NGuA== X-Received: by 2002:a17:906:51ce:b0:9ae:2f35:442a with SMTP id v14-20020a17090651ce00b009ae2f35442amr10465695ejk.5.1698299041064; Wed, 25 Oct 2023 22:44:01 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id o14-20020a17090611ce00b009b29553b648sm10907859eja.206.2023.10.25.22.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:00 -0700 (PDT) Date: Thu, 26 Oct 2023 07:43:59 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Remove loops with constant MAX_RX_QUEUE Message-ID: <8bc9d3c15fba082a928ea2c0916a6aef5f76f456.1698295861.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" MAX_RX_QUEUE is set to 1. All loops with MAX_RX_QUEUE run only one cycle. Remove loops. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 120 +++++++++---------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index ba35ae4a21fa..2f0fc7c0f216 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1141,28 +1141,26 @@ void rtl92e_tx_enable(struct net_device *dev) static void _rtl92e_free_rx_ring(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - int i, rx_queue_idx; - - for (rx_queue_idx =3D 0; rx_queue_idx < MAX_RX_QUEUE; - rx_queue_idx++) { - for (i =3D 0; i < priv->rxringcount; i++) { - struct sk_buff *skb =3D priv->rx_buf[rx_queue_idx][i]; + int i; + int rx_queue_idx =3D 0; =20 - if (!skb) - continue; + for (i =3D 0; i < priv->rxringcount; i++) { + struct sk_buff *skb =3D priv->rx_buf[rx_queue_idx][i]; =20 - dma_unmap_single(&priv->pdev->dev, - *((dma_addr_t *)skb->cb), - priv->rxbuffersize, DMA_FROM_DEVICE); - kfree_skb(skb); - } + if (!skb) + continue; =20 - dma_free_coherent(&priv->pdev->dev, - sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, - priv->rx_ring[rx_queue_idx], - priv->rx_ring_dma[rx_queue_idx]); - priv->rx_ring[rx_queue_idx] =3D NULL; + dma_unmap_single(&priv->pdev->dev, + *((dma_addr_t *)skb->cb), + priv->rxbuffersize, DMA_FROM_DEVICE); + kfree_skb(skb); } + + dma_free_coherent(&priv->pdev->dev, + sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, + priv->rx_ring[rx_queue_idx], + priv->rx_ring_dma[rx_queue_idx]); + priv->rx_ring[rx_queue_idx] =3D NULL; } =20 static void _rtl92e_free_tx_ring(struct net_device *dev, unsigned int prio) @@ -1353,47 +1351,46 @@ static short _rtl92e_alloc_rx_ring(struct net_devic= e *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rx_desc *entry =3D NULL; - int i, rx_queue_idx; - - for (rx_queue_idx =3D 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) { - priv->rx_ring[rx_queue_idx] =3D dma_alloc_coherent(&priv->pdev->dev, - sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, - &priv->rx_ring_dma[rx_queue_idx], - GFP_ATOMIC); - if (!priv->rx_ring[rx_queue_idx] || - (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) { - netdev_warn(dev, "Cannot allocate RX ring\n"); - return -ENOMEM; - } - - priv->rx_idx[rx_queue_idx] =3D 0; + int i; + int rx_queue_idx =3D 0; + + priv->rx_ring[rx_queue_idx] =3D dma_alloc_coherent(&priv->pdev->dev, + sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, + &priv->rx_ring_dma[rx_queue_idx], + GFP_ATOMIC); + if (!priv->rx_ring[rx_queue_idx] || + (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) { + netdev_warn(dev, "Cannot allocate RX ring\n"); + return -ENOMEM; + } =20 - for (i =3D 0; i < priv->rxringcount; i++) { - struct sk_buff *skb =3D dev_alloc_skb(priv->rxbuffersize); - dma_addr_t *mapping; + priv->rx_idx[rx_queue_idx] =3D 0; =20 - entry =3D &priv->rx_ring[rx_queue_idx][i]; - if (!skb) - return 0; - skb->dev =3D dev; - priv->rx_buf[rx_queue_idx][i] =3D skb; - mapping =3D (dma_addr_t *)skb->cb; - *mapping =3D dma_map_single(&priv->pdev->dev, - skb_tail_pointer(skb), - priv->rxbuffersize, DMA_FROM_DEVICE); - if (dma_mapping_error(&priv->pdev->dev, *mapping)) { - dev_kfree_skb_any(skb); - return -1; - } - entry->BufferAddress =3D *mapping; + for (i =3D 0; i < priv->rxringcount; i++) { + struct sk_buff *skb =3D dev_alloc_skb(priv->rxbuffersize); + dma_addr_t *mapping; =20 - entry->Length =3D priv->rxbuffersize; - entry->OWN =3D 1; + entry =3D &priv->rx_ring[rx_queue_idx][i]; + if (!skb) + return 0; + skb->dev =3D dev; + priv->rx_buf[rx_queue_idx][i] =3D skb; + mapping =3D (dma_addr_t *)skb->cb; + *mapping =3D dma_map_single(&priv->pdev->dev, + skb_tail_pointer(skb), + priv->rxbuffersize, DMA_FROM_DEVICE); + if (dma_mapping_error(&priv->pdev->dev, *mapping)) { + dev_kfree_skb_any(skb); + return -1; } + entry->BufferAddress =3D *mapping; =20 - if (entry) - entry->EOR =3D 1; + entry->Length =3D priv->rxbuffersize; + entry->OWN =3D 1; } + + if (entry) + entry->EOR =3D 1; return 0; } =20 @@ -1455,19 +1452,18 @@ static short _rtl92e_pci_initdescring(struct net_de= vice *dev) void rtl92e_reset_desc_ring(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - int i, rx_queue_idx; + int i; + int rx_queue_idx =3D 0; unsigned long flags =3D 0; =20 - for (rx_queue_idx =3D 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) { - if (priv->rx_ring[rx_queue_idx]) { - struct rx_desc *entry =3D NULL; + if (priv->rx_ring[rx_queue_idx]) { + struct rx_desc *entry =3D NULL; =20 - for (i =3D 0; i < priv->rxringcount; i++) { - entry =3D &priv->rx_ring[rx_queue_idx][i]; - entry->OWN =3D 1; - } - priv->rx_idx[rx_queue_idx] =3D 0; + for (i =3D 0; i < priv->rxringcount; i++) { + entry =3D &priv->rx_ring[rx_queue_idx][i]; + entry->OWN =3D 1; } + priv->rx_idx[rx_queue_idx] =3D 0; } =20 spin_lock_irqsave(&priv->irq_th_lock, flags); --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 96C09C25B48 for ; Thu, 26 Oct 2023 05:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344232AbjJZFoh (ORCPT ); Thu, 26 Oct 2023 01:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234939AbjJZFoN (ORCPT ); Thu, 26 Oct 2023 01:44:13 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40D40D64 for ; Wed, 25 Oct 2023 22:44:08 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9bfbc393dfaso12044966b.1 for ; Wed, 25 Oct 2023 22:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299046; x=1698903846; 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=NK++5DiuxJTPHibT8VaHHf3bgG67tMPkAr+ypnICuHE=; b=gCkyU0fa34H0m/gUycvSu4zu3udHzb0DUOmGHq5YDjsM+pZx4F10FXbKVXBM9DvhKr RYFihMbGxXS0H/uUuDOh64/e7T+wMegcHcX3aXDOQ975Viz7S+hfE2Er7cikDblGsuxb HY9FuqXlJLmND8zFVJ+OD5LkiaWWJc8saJFZ3R13z0kmEBHnNWeuYqEAID1cWPuPXMv4 6z29WoPpvBdUMzU7DUMQCqYTFr+NI++0tnxlM5WLBoxqet7tDsLE7YMUhRBjOPHZyb7O 43FxOXxLNsFG34mjBDUzVL4LXCzJtaVYef4vD2EzTMLMHKDqnNhauPM4ZgVOQK2UJYKA TKzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299046; x=1698903846; 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=NK++5DiuxJTPHibT8VaHHf3bgG67tMPkAr+ypnICuHE=; b=n7hvOQenpBF3i7Eg6Y20JTYUd4LLU1/FnLddCJ3S8+OG23pk81IXz9ome8kKfQ4lqr YwdwoKqHlUUBpcolc+wNBhlE5J7WPrdgTBED/l2BrbVmMx3TQ4N5yUfBj6IJ5FdYcswQ WgRJy6S4hsSha/xAUEcGnp7h4vYpxNn03zRTbG4hf4y4L4AIeNZ2dsB/fHXfUQlJ7ry3 5lVju9CdH0UKfEEFuYvKlzBBrU40uRCImuVtFw7GqDcjbsY57BmIPx5K1xwXnCQxPm5+ btcvdmCwjS2seN2pRhYXGJv+bFMiYXT0AW4I5nccVnL7ttyLJ/ICl9EH19R/SIu6z1nt cCnA== X-Gm-Message-State: AOJu0YzB8cYrp8K6WyVu3XNO9WsU+Z1IKvLQuMcOO+SM8R5R8G+Cj4EZ zsHlCAzSYvvHCrdyScblUzM= X-Google-Smtp-Source: AGHT+IEZPodmVtixZvoF2A3QU5hK55l0bYHD13t2+/vkydpXb90IeMLaHJf/MEIjQBudDR2pVP5mCg== X-Received: by 2002:a17:906:29c:b0:9c4:950:92b5 with SMTP id 28-20020a170906029c00b009c4095092b5mr12732010ejf.6.1698299046699; Wed, 25 Oct 2023 22:44:06 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id c2-20020a170906694200b0099bc80d5575sm10951258ejs.200.2023.10.25.22.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:06 -0700 (PDT) Date: Thu, 26 Oct 2023 07:44:05 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Convert array rx_ring[] to variable rx_ring 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" Convert array rx_ring[] to variable rx_ring as index is always 0. This increases readability. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 25 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 2f0fc7c0f216..d0d5b1dfff48 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1157,10 +1157,10 @@ static void _rtl92e_free_rx_ring(struct net_device = *dev) } =20 dma_free_coherent(&priv->pdev->dev, - sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, - priv->rx_ring[rx_queue_idx], + sizeof(*priv->rx_ring) * priv->rxringcount, + priv->rx_ring, priv->rx_ring_dma[rx_queue_idx]); - priv->rx_ring[rx_queue_idx] =3D NULL; + priv->rx_ring =3D NULL; } =20 static void _rtl92e_free_tx_ring(struct net_device *dev, unsigned int prio) @@ -1354,12 +1354,11 @@ static short _rtl92e_alloc_rx_ring(struct net_devic= e *dev) int i; int rx_queue_idx =3D 0; =20 - priv->rx_ring[rx_queue_idx] =3D dma_alloc_coherent(&priv->pdev->dev, - sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount, - &priv->rx_ring_dma[rx_queue_idx], - GFP_ATOMIC); - if (!priv->rx_ring[rx_queue_idx] || - (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) { + priv->rx_ring =3D dma_alloc_coherent(&priv->pdev->dev, + sizeof(*priv->rx_ring) * priv->rxringcount, + &priv->rx_ring_dma[rx_queue_idx], + GFP_ATOMIC); + if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) { netdev_warn(dev, "Cannot allocate RX ring\n"); return -ENOMEM; } @@ -1370,7 +1369,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) struct sk_buff *skb =3D dev_alloc_skb(priv->rxbuffersize); dma_addr_t *mapping; =20 - entry =3D &priv->rx_ring[rx_queue_idx][i]; + entry =3D &priv->rx_ring[i]; if (!skb) return 0; skb->dev =3D dev; @@ -1456,11 +1455,11 @@ void rtl92e_reset_desc_ring(struct net_device *dev) int rx_queue_idx =3D 0; unsigned long flags =3D 0; =20 - if (priv->rx_ring[rx_queue_idx]) { + if (priv->rx_ring) { struct rx_desc *entry =3D NULL; =20 for (i =3D 0; i < priv->rxringcount; i++) { - entry =3D &priv->rx_ring[rx_queue_idx][i]; + entry =3D &priv->rx_ring[i]; entry->OWN =3D 1; } priv->rx_idx[rx_queue_idx] =3D 0; @@ -1574,7 +1573,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) stats.nic_type =3D NIC_8192E; =20 while (count--) { - struct rx_desc *pdesc =3D &priv->rx_ring[rx_queue_idx] + struct rx_desc *pdesc =3D &priv->rx_ring [priv->rx_idx[rx_queue_idx]]; struct sk_buff *skb =3D priv->rx_buf[rx_queue_idx] [priv->rx_idx[rx_queue_idx]]; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index d4e998cfbefc..caa8a00cc922 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -232,7 +232,7 @@ struct r8192_priv { =20 u8 (*rf_set_chan)(struct net_device *dev, u8 ch); =20 - struct rx_desc *rx_ring[MAX_RX_QUEUE]; + struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT]; dma_addr_t rx_ring_dma[MAX_RX_QUEUE]; unsigned int rx_idx[MAX_RX_QUEUE]; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 1AC96C25B67 for ; Thu, 26 Oct 2023 05:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344016AbjJZFoc (ORCPT ); Thu, 26 Oct 2023 01:44:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234925AbjJZFoV (ORCPT ); Thu, 26 Oct 2023 01:44:21 -0400 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 279D519F for ; Wed, 25 Oct 2023 22:44:15 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9c6f0530929so14428666b.1 for ; Wed, 25 Oct 2023 22:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299054; x=1698903854; 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=uNXP1byPvesZdfc6sqLsUl9gM3gqBThouw1QohVxG38=; b=cTPLSCj5pBBbnJ7GDsUcW0qoVBdwW6GNKKH9bDn2PoGdIIXkLXtvapFqOZy8nvn0gT VSi/0Rrf66bhGIyj32XAIxvZXEZXbmYWUtACQkZHKwlxNbAF0rUrIh8OtHceSVhrdENX 6Vtv9QZTspzUFXfGllNQew8NxNwplhzQTyJXqlZUwaFH0INhMQ0mjUQSsY7GgSbQb/S8 06BFgEJxht7GzIXLiRecGN6aHPLDJOhh3j0EJO1WNFT4f2EzBTF0mxzpE4p4H8tAz6p0 GzONI2vkquHI7SHF00kdw8C/2fF5lIdSdZYF92FXAAn6rKAwyh+knYDqoQaXSWPYHSjN po6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299054; x=1698903854; 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=uNXP1byPvesZdfc6sqLsUl9gM3gqBThouw1QohVxG38=; b=Uq9hNAmDBzDS+o+x7DWO9Av2jBUCJFDH63LXZyksECvomfBnR1mSgCVSK/krFduvJJ ceU4v9zkmF1CBgrfBtoFvTu+hnlxo7YKEVrcjrFZc96Gswgibs+RtEx1v+5+zcqbE0NQ VaCX5js+BchzwBiUyyMNm3/hD1PLjUdC20JMrMqG3RvmcxIL8OJtUtgyqR7qSpe0I16M jPX5ot88EGOvGOZqaLerPRfRbBckinwv04udGlELCL2C+VSwMiRciX/1mLWvN0QXjfSM Z+hUwWdh0amMxuW6oqqf8jt/+b6Hu+KxRlnGyqxdUWRBM6CZdduPwzIU9rphMKYa5wjy HIvA== X-Gm-Message-State: AOJu0Yzl6Yx6Gxq704GhNSvTW104aSugpqvdLdDgaMRfqkyXpha2VADX TLZqUqLpgCIUKjIrwr8x+OI= X-Google-Smtp-Source: AGHT+IEUQb7ZEfMb1j7XIWettGwOTwr8B03mIxUOw0AP3WBsKgtvIOnTbNoEuxTSWSEz4NBAAB21Bg== X-Received: by 2002:a17:906:74d1:b0:9be:3483:94da with SMTP id z17-20020a17090674d100b009be348394damr11842255ejl.1.1698299053674; Wed, 25 Oct 2023 22:44:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id ov6-20020a170906fc0600b009ce03057c4dsm1684281ejb.2.2023.10.25.22.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:13 -0700 (PDT) Date: Thu, 26 Oct 2023 07:44:11 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Convert array rx_buf[][] to array rx_buf[] Message-ID: <967337963336cf09383003050b12c43c779e1562.1698295861.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" Convert array rx_buf[][] to array rx_buf[] as index is always 0. This increases readability. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index d0d5b1dfff48..573d548e44d8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1145,7 +1145,7 @@ static void _rtl92e_free_rx_ring(struct net_device *d= ev) int rx_queue_idx =3D 0; =20 for (i =3D 0; i < priv->rxringcount; i++) { - struct sk_buff *skb =3D priv->rx_buf[rx_queue_idx][i]; + struct sk_buff *skb =3D priv->rx_buf[i]; =20 if (!skb) continue; @@ -1373,7 +1373,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) if (!skb) return 0; skb->dev =3D dev; - priv->rx_buf[rx_queue_idx][i] =3D skb; + priv->rx_buf[i] =3D skb; mapping =3D (dma_addr_t *)skb->cb; *mapping =3D dma_map_single(&priv->pdev->dev, skb_tail_pointer(skb), @@ -1575,7 +1575,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) while (count--) { struct rx_desc *pdesc =3D &priv->rx_ring [priv->rx_idx[rx_queue_idx]]; - struct sk_buff *skb =3D priv->rx_buf[rx_queue_idx] + struct sk_buff *skb =3D priv->rx_buf [priv->rx_idx[rx_queue_idx]]; struct sk_buff *new_skb; =20 @@ -1614,7 +1614,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) skb =3D new_skb; skb->dev =3D dev; =20 - priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] =3D + priv->rx_buf[priv->rx_idx[rx_queue_idx]] =3D skb; *((dma_addr_t *)skb->cb) =3D dma_map_single(&priv->pdev->dev, skb_tail_pointer(skb), diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index caa8a00cc922..2a99873fbe90 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -233,7 +233,7 @@ struct r8192_priv { u8 (*rf_set_chan)(struct net_device *dev, u8 ch); =20 struct rx_desc *rx_ring; - struct sk_buff *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT]; + struct sk_buff *rx_buf[MAX_RX_COUNT]; dma_addr_t rx_ring_dma[MAX_RX_QUEUE]; unsigned int rx_idx[MAX_RX_QUEUE]; int rxringcount; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 AC2ADC25B48 for ; Thu, 26 Oct 2023 05:44:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344483AbjJZFow (ORCPT ); Thu, 26 Oct 2023 01:44:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343906AbjJZFob (ORCPT ); Thu, 26 Oct 2023 01:44:31 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABD07189 for ; Wed, 25 Oct 2023 22:44:21 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-54115c72f78so116127a12.1 for ; Wed, 25 Oct 2023 22:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299060; x=1698903860; 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=imLoq3QOIDWhZVVFMyITjeWZi//HhodEfugMiQeWmFQ=; b=NMnGdXhEBz3HXa38KqE9v8Zi90Xp6CXEk35P4CU6qKf1IuaIuC1D1sSG5nMwDDulrO raWH11a1DBOlVE3ljrn7ou+PBw3GT4cJdhWXxyf4qeSAsmbxbDi1NZ207iUzeQJFOW9l eOxc79uX3GGR1wY0D4retDWKEptnK3GgaOsWMgqd4u234ekskNAB1R6aBu38JxKYvA+X KSfEawE9GjpaORJCk2QsxwMxTsoCPsYPuE4eHXY8HML+XaYG/FTc7C9yfxdzsvkTD6Po BZm98IRiew7PbYBRXYJo2ZQUFgFslJUiCvJ/XnieC0+0tSEDMl5Matqkch5cI3vfZM2Z NTEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299060; x=1698903860; 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=imLoq3QOIDWhZVVFMyITjeWZi//HhodEfugMiQeWmFQ=; b=owSo4nkKUYiiUnS+w/auELgDIwD2iCrgJVw94p0c1zpsMdvaWdSnTQWWR2bPfbAp7n 7DoZTRl0qAL+3EB4s8oWLPCKnVJewAM60QyoxHdvP69MMK5DM1ok1/9IDz89q5EWDvDU IhKL0jh3jTCs72RcVvPcjWs/dVfMExit+/iklPEmZ3QuNXeBYJ5grJyUcE8Jtu/iNihi yF+kbTwC10jHYd+naO7Tvar++7i4MWDZpkKfff/6+oDrQfGEucITbj4BoGabMPlXpFZq IUzbzsjV3/JCdA4qKcw3jGu9TwAjt/Tf9FwAtwDgzAwpvApGgkSKGG11TLA43+cUQxqZ 6VNg== X-Gm-Message-State: AOJu0YwTjsiEKAkEaXWWWPu0GJ65Z+X0CCYmF93y+Zf8xDKYlTU1n8ch OjkD7ES8rsUcJ1BUJveVl7NYoytXakI= X-Google-Smtp-Source: AGHT+IHOXgcA1TCybO2sbdaKfI+5D4MQxJngk/NOUAuorwVFoL4JhzWvNNBViBPEB/4sQHXxWbEkkQ== X-Received: by 2002:a17:906:59a5:b0:9cb:798f:91e8 with SMTP id m37-20020a17090659a500b009cb798f91e8mr5736638ejs.6.1698299059999; Wed, 25 Oct 2023 22:44:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id n13-20020a17090673cd00b00991faf3810esm11261518ejl.146.2023.10.25.22.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:19 -0700 (PDT) Date: Thu, 26 Oct 2023 07:44:18 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Convert array rx_ring_dma[] to variable rx_ring_dma Message-ID: <51d3be0a715452cefe5ac6dd29a86fbe65b824fa.1698295861.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" Convert array rx_ring_dma[] to variable rx_ring_dma as index is always 0. This increases readability. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e343e10e011a..e93394c51264 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1841,7 +1841,7 @@ void rtl92e_enable_rx(struct net_device *dev) { struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); =20 - rtl92e_writel(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]); + rtl92e_writel(dev, RDQDA, priv->rx_ring_dma); } =20 static const u32 TX_DESC_BASE[] =3D { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 573d548e44d8..8af732870ddf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1159,7 +1159,7 @@ static void _rtl92e_free_rx_ring(struct net_device *d= ev) dma_free_coherent(&priv->pdev->dev, sizeof(*priv->rx_ring) * priv->rxringcount, priv->rx_ring, - priv->rx_ring_dma[rx_queue_idx]); + priv->rx_ring_dma); priv->rx_ring =3D NULL; } =20 @@ -1356,7 +1356,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) =20 priv->rx_ring =3D dma_alloc_coherent(&priv->pdev->dev, sizeof(*priv->rx_ring) * priv->rxringcount, - &priv->rx_ring_dma[rx_queue_idx], + &priv->rx_ring_dma, GFP_ATOMIC); if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) { netdev_warn(dev, "Cannot allocate RX ring\n"); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 2a99873fbe90..b3ebff2df62a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -234,7 +234,7 @@ struct r8192_priv { =20 struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_COUNT]; - dma_addr_t rx_ring_dma[MAX_RX_QUEUE]; + dma_addr_t rx_ring_dma; unsigned int rx_idx[MAX_RX_QUEUE]; int rxringcount; u16 rxbuffersize; --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 5204AC25B48 for ; Thu, 26 Oct 2023 05:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234936AbjJZFo4 (ORCPT ); Thu, 26 Oct 2023 01:44:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344194AbjJZFoe (ORCPT ); Thu, 26 Oct 2023 01:44:34 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E19F195 for ; Wed, 25 Oct 2023 22:44:28 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9c14313eb1cso12811966b.0 for ; Wed, 25 Oct 2023 22:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299067; x=1698903867; 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=I7zJ5qciR0a1yJaFSt2HKre85R/60luQy84wqPr6HdY=; b=Y0Wzf9VDObOSyO+oVqvnU7Vxzi0rBIeQJCjboKDhWuX0/dbTIDpN9cB5ipJ464AZyW SPVj23r/ok1GEe5X9K5647rAWKHmakGuv0FzbMyuX1Des1xTkI8TPlGg0kFdOjMCk0Sp Upm8TEz3PnqPsUNlv7aO0VaGajj8dlk63nmKlWNX/XWKnTG7ACpDB3btA6u0T0dzhCGU sO0LjCQI54IkhESZ/1Fg78kCidTDFMzwP+7giFTygbY4v+YJS6vROq2w2hepURPbUvvv YvIHCwa7m1aCqD1XPiLdKE7V2qe6ybP13moGs7JOAlFCOyrCHlZSYPpPA7YfYUx1rQ/a XJZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299067; x=1698903867; 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=I7zJ5qciR0a1yJaFSt2HKre85R/60luQy84wqPr6HdY=; b=chnO34jFAOh3fhPEKylMimev2mWJfKQU4NVEPuTXW/wB8q9iYqleANBP99JmHxUqLU xA0BtIxd1p0rZAOEiTZsxC6AmBuM+J4uiRRtLth6ZRPLlsQ/A/Ry3Ap6wtYRwXuAeDir bo/niXs5nkV1b5pratm/Qx8HxMPn22gJfBgVb7hLvHMBPY5Nyv+t6ut7GnyW/xa+vpvp en7688Hg1kxNPLQ7sO/A5B0+pDi7hqHCbETtcdkUWyT2N2RtTDRZUese+9gbfdthG52C C5gWJB38WIpY1cAWlifiAlBvGLBG6szDNLDy2slXRJIy+m2Ohs5uynAM8nyzuhwuMaLT cEaA== X-Gm-Message-State: AOJu0YzDxZcBS8zY30utej4lb2fA/8HNi6ue9g4XCU+Gax5u40zM89gV jUe+slQVvHKSNKNl+QpwSAw= X-Google-Smtp-Source: AGHT+IHV6G3U8Ei6EOu/OCLtkRiBF8d/MORMapHftlJzMU92/7VuVDsYg8oqia1NozyCxV+whorzvw== X-Received: by 2002:a17:906:74d1:b0:9bf:5696:9154 with SMTP id z17-20020a17090674d100b009bf56969154mr11621970ejl.2.1698299066717; Wed, 25 Oct 2023 22:44:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id gs26-20020a170906f19a00b0099ddc81903asm11076722ejb.221.2023.10.25.22.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:26 -0700 (PDT) Date: Thu, 26 Oct 2023 07:44:24 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Convert array rx_idx[] to variable rx_idx 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" Convert array rx_idx[] to variable rx_idx as index is always 0. Remove unused rx_queue_idx as well. This increases readability. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 18 +++++++----------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 8af732870ddf..d2a8a9543579 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1142,7 +1142,6 @@ static void _rtl92e_free_rx_ring(struct net_device *d= ev) { struct r8192_priv *priv =3D rtllib_priv(dev); int i; - int rx_queue_idx =3D 0; =20 for (i =3D 0; i < priv->rxringcount; i++) { struct sk_buff *skb =3D priv->rx_buf[i]; @@ -1352,7 +1351,6 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) struct r8192_priv *priv =3D rtllib_priv(dev); struct rx_desc *entry =3D NULL; int i; - int rx_queue_idx =3D 0; =20 priv->rx_ring =3D dma_alloc_coherent(&priv->pdev->dev, sizeof(*priv->rx_ring) * priv->rxringcount, @@ -1363,7 +1361,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) return -ENOMEM; } =20 - priv->rx_idx[rx_queue_idx] =3D 0; + priv->rx_idx =3D 0; =20 for (i =3D 0; i < priv->rxringcount; i++) { struct sk_buff *skb =3D dev_alloc_skb(priv->rxbuffersize); @@ -1452,7 +1450,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); int i; - int rx_queue_idx =3D 0; unsigned long flags =3D 0; =20 if (priv->rx_ring) { @@ -1462,7 +1459,7 @@ void rtl92e_reset_desc_ring(struct net_device *dev) entry =3D &priv->rx_ring[i]; entry->OWN =3D 1; } - priv->rx_idx[rx_queue_idx] =3D 0; + priv->rx_idx =3D 0; } =20 spin_lock_irqsave(&priv->irq_th_lock, flags); @@ -1561,7 +1558,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) struct ieee80211_hdr *rtllib_hdr =3D NULL; bool unicast_packet =3D false; u32 skb_len =3D 0; - int rx_queue_idx =3D RX_MPDU_QUEUE; =20 struct rtllib_rx_stats stats =3D { .signal =3D 0, @@ -1574,9 +1570,9 @@ static void _rtl92e_rx_normal(struct net_device *dev) =20 while (count--) { struct rx_desc *pdesc =3D &priv->rx_ring - [priv->rx_idx[rx_queue_idx]]; + [priv->rx_idx]; struct sk_buff *skb =3D priv->rx_buf - [priv->rx_idx[rx_queue_idx]]; + [priv->rx_idx]; struct sk_buff *new_skb; =20 if (pdesc->OWN) @@ -1614,7 +1610,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) skb =3D new_skb; skb->dev =3D dev; =20 - priv->rx_buf[priv->rx_idx[rx_queue_idx]] =3D + priv->rx_buf[priv->rx_idx] =3D skb; *((dma_addr_t *)skb->cb) =3D dma_map_single(&priv->pdev->dev, skb_tail_pointer(skb), @@ -1627,9 +1623,9 @@ static void _rtl92e_rx_normal(struct net_device *dev) pdesc->BufferAddress =3D *((dma_addr_t *)skb->cb); pdesc->OWN =3D 1; pdesc->Length =3D priv->rxbuffersize; - if (priv->rx_idx[rx_queue_idx] =3D=3D priv->rxringcount - 1) + if (priv->rx_idx =3D=3D priv->rxringcount - 1) pdesc->EOR =3D 1; - priv->rx_idx[rx_queue_idx] =3D (priv->rx_idx[rx_queue_idx] + 1) % + priv->rx_idx =3D (priv->rx_idx + 1) % priv->rxringcount; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index b3ebff2df62a..a6c47388d72c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -235,7 +235,7 @@ struct r8192_priv { struct rx_desc *rx_ring; struct sk_buff *rx_buf[MAX_RX_COUNT]; dma_addr_t rx_ring_dma; - unsigned int rx_idx[MAX_RX_QUEUE]; + unsigned int rx_idx; int rxringcount; u16 rxbuffersize; =20 --=20 2.42.0 From nobody Tue Dec 16 11:48:20 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 E4283C25B48 for ; Thu, 26 Oct 2023 05:45:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229772AbjJZFpB (ORCPT ); Thu, 26 Oct 2023 01:45:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344254AbjJZFoh (ORCPT ); Thu, 26 Oct 2023 01:44:37 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0F4F1B1 for ; Wed, 25 Oct 2023 22:44:33 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9bfbc393dfaso12052266b.1 for ; Wed, 25 Oct 2023 22:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698299072; x=1698903872; 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=pj8Q7YsY/vYkJDue8+dvhserphxMSxUdnrU/yK6lzXQ=; b=RwJIFyPUAT79yCaGZgyZNjJQPid0meKF+FvedNn4Bmx0Co/nwQ9g1eWW2WKUD4OGH5 TwLBUbKhPZiaixahtosTFE+n+rq4vZodmseQwWWKwQmNxNiqQ5EJ68apJ7MutgTxsQ4x g8PC6v7qO/Jk6Th1Qh2O1FPvbaZUJOFmlmImdrMga7Nl+YXX8Nj6zdtS8DVeKTOh6Mmm JhhKZ6RJh2wNieCJQsZYAEB+ZdPbm4PYKgzBpqyDOC1yTcuYtxcuuANLg4fG9k/nMUN6 2mmUPRIaf75aoEsDpYEWINOugvzNInRaw44cxw11/6p140Gj6oG/Wlg4ammOsP6p4CSq YrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698299072; x=1698903872; 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=pj8Q7YsY/vYkJDue8+dvhserphxMSxUdnrU/yK6lzXQ=; b=nEveb5WcKteuCoA3huMaWHHJI3NrYqCMsVDLtWXXnrsi9DmVH43+vscY5q74rjIo3h bxkW3XbLUT7DCfMmHYB0tifzoyiTFFpiaZzALHh60C8ys+bQRCG78Lcd7LrELvFzVDty SF6C6RDfsmFHpDppeYNTnHiZtMZaTTNjO7C+n0xnm3OYbMiE7SJRHAnzY60crWhBv52P H8z3CZn2BxdYbEy6659LWRp9rDP0lNdUHmH3cAbi4bnbKiNPtgvWt4DJuOkLD+Ag9F9i DbprF8IX5wfuSQmA3PSy+RwN4L0fKv421KOeb13bi69etvJ0hzqAYVCm/RM2quA+XdTz TL0Q== X-Gm-Message-State: AOJu0YxgjeXqelYRpkV7MUNLbcshpNNBSjKBxFQjgpWCjTBJK7Km5LKn YA1IPwV5Om1enJ1g0o9PLTozSOjFJSU= X-Google-Smtp-Source: AGHT+IEUTXYnXCN5fDsGVzGmmv4KTEHOhjaAmgsj9i0QbvMs5CJl71PZMyfWOQuPuEV+Aw8f+oyVHQ== X-Received: by 2002:a17:906:2250:b0:9bd:cab6:a34b with SMTP id 16-20020a170906225000b009bdcab6a34bmr13813147ejr.0.1698299072414; Wed, 25 Oct 2023 22:44:32 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id x9-20020a170906b08900b0099ce188be7fsm10953361ejy.3.2023.10.25.22.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:44:32 -0700 (PDT) Date: Thu, 26 Oct 2023 07:44:30 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove unused constants starting with MAX_RX_QUEUE Message-ID: <0809e3380ce76354d689edd80b82adada5a18d4e.1698295861.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 constants. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8190P_def.h | 2 - .../staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 62 +------------------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 - drivers/staging/rtl8192e/rtl819x_Qos.h | 1 - drivers/staging/rtl8192e/rtl819x_TS.h | 1 - drivers/staging/rtl8192e/rtllib.h | 1 - 6 files changed, 1 insertion(+), 68 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8190P_def.h index c229fd244a48..8c85f1c866d3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h @@ -11,8 +11,6 @@ =20 #define MAX_SILENT_RESET_RX_SLOT_NUM 10 =20 -#define RX_MPDU_QUEUE 0 - enum rtl819x_loopback { RTL819X_NO_LOOPBACK =3D 0, RTL819X_MAC_LOOPBACK =3D 1, diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/st= aging/rtl8192e/rtl8192e/r8192E_phyreg.h index 24fb0ca539ea..c48c56869c19 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h @@ -248,75 +248,15 @@ #define bPAEnd 0xf #define bTREnd 0x0f000000 #define bRFEnd 0x000f0000 -/* T2R */ -#define bCCAMask 0x000000f0 -#define bR2RCCAMask 0x00000f00 -#define bHSSI_R2TDelay 0xf8000000 -#define bHSSI_T2RDelay 0xf80000 /* Channel gain at continue TX. */ -#define bContTxHSSI 0x400 -#define bIGFromCCK 0x200 -#define bAGCAddress 0x3f -#define bRxHPTx 0x7000 -#define bRxHPT2R 0x38000 -#define bRxHPCCKIni 0xc0000 -#define bAGCTxCode 0xc00000 -#define bAGCRxCode 0x300000 #define b3WireDataLength 0x800 #define b3WireAddressLength 0x400 -#define b3WireRFPowerDown 0x1 -/*#define bHWSISelect 0x8 */ -#define b2GPAPEPolarity 0x80000000 -#define bRFSW_TxDefaultAnt 0x3 -#define bRFSW_TxOptionAnt 0x30 -#define bRFSW_RxDefaultAnt 0x300 -#define bRFSW_RxOptionAnt 0x3000 -#define bRFSI_3WireData 0x1 -#define bRFSI_3WireClock 0x2 -#define bRFSI_3WireLoad 0x4 -#define bRFSI_3WireRW 0x8 /* 3-wire total control */ -#define bRFSI_3Wire 0xf #define bRFSI_RFENV 0x10 -#define bRFSI_TRSW 0x20 -#define bRFSI_TRSWB 0x40 -#define bRFSI_ANTSW 0x100 -#define bRFSI_ANTSWB 0x200 -#define bRFSI_PAPE 0x400 -#define bBandSelect 0x1 -#define bHTSIG2_GI 0x80 -#define bHTSIG2_Smoothing 0x01 -#define bHTSIG2_Sounding 0x02 -#define bHTSIG2_Aggreaton 0x08 -#define bHTSIG2_STBC 0x30 -#define bHTSIG2_AdvCoding 0x40 -#define bHTSIG2_NumOfHTLTF 0x300 -#define bHTSIG2_CRC8 0x3fc -#define bHTSIG1_MCS 0x7f -#define bHTSIG1_BandWidth 0x80 -#define bHTSIG1_HTLength 0xffff -#define bLSIG_Rate 0xf -#define bLSIG_Reserved 0x10 -#define bLSIG_Length 0x1fffe -#define bLSIG_Parity 0x20 -#define bCCKRxPhase 0x4 #define bLSSIReadAddress 0x3f000000 /* LSSI "read" address */ #define bLSSIReadEdge 0x80000000 /* LSSI "read" edge signal */ #define bLSSIReadBackData 0xfff -#define bLSSIReadOKFlag 0x1000 -#define bCCKSampleRate 0x8 /* 0: 44 MHz, 1: 88MHz */ - -#define bRegulator0Standby 0x1 -#define bRegulatorPLLStandby 0x2 -#define bRegulator1Standby 0x4 -#define bPLLPowerUp 0x8 -#define bDPLLPowerUp 0x10 -#define bDA10PowerUp 0x20 -#define bAD7PowerUp 0x200 -#define bDA6PowerUp 0x2000 -#define bXtalPowerUp 0x4000 -#define b40MDClkPowerUP 0x8000 -#define bDA6DebugMode 0x20000 + #define bDA6Swing 0x380000 #define bADClkPhase 0x4000000 #define b80MClkDelay 0x18000000 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index a6c47388d72c..a4afbf3e934d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -91,8 +91,6 @@ =20 #define MAX_TX_QUEUE 9 =20 -#define MAX_RX_QUEUE 1 - #define MAX_RX_COUNT 64 #define MAX_TX_QUEUE_COUNT 9 =20 diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index f547de4c1da3..1c00092ea3a5 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -21,7 +21,6 @@ struct octet_string { #define AC1_BK 1 #define AC2_VI 2 #define AC3_VO 3 -#define AC_MAX 4 =20 enum direction_value { DIR_UP =3D 0, diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index ab737428d4a7..fff36315f174 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -10,7 +10,6 @@ #define TS_ADDBA_DELAY 60 =20 #define TOTAL_TS_NUM 16 -#define TCLAS_NUM 4 =20 enum tr_select { TX_DIR =3D 0, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index dc3488d9693f..d2cf3cfaaaba 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -911,7 +911,6 @@ enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM= _six_frame}; ((up) < 6) ? WME_AC_VI : \ WME_AC_VO) =20 -#define ETHER_ADDR_LEN 6 /* length of an Ethernet address */ #define ETHERNET_HEADER_SIZE 14 /* length of two Ethernet address * plus ether type */ --=20 2.42.0