From nobody Sat Apr 11 14:00:31 2026 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 746FCC04AA5 for ; Wed, 24 Aug 2022 20:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240247AbiHXUOq (ORCPT ); Wed, 24 Aug 2022 16:14:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239670AbiHXUOj (ORCPT ); Wed, 24 Aug 2022 16:14:39 -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 00C3F7C53E for ; Wed, 24 Aug 2022 13:14:37 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id u9so6663945ejy.5 for ; Wed, 24 Aug 2022 13:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=2cyaS4gO5h/F5vHUL0nItZes1zeuwWKpTfH3a+yaz5w=; b=iEsi0k5fwHIYGRSUKl4X3Zk1ANLBJHZVjPKOnl+IkpmbLv+LgJB1Ym2vjjT9R8vLtE KfC9XMQVKntWiOpDhMgGlZIBKgER4E2Qpu38n5p6y5Y72iFyZf3w8qFGcHeobIQTInUd 8OIsOSVFasfIeeuoEvY2gCeIXODTpSxaDmfVk9vpUytUKDuU7kALfD7HKXw06q6XrBMK rQmFWNo+Z/iOnrH91VOVrEJmgjRwMqGGh/BIew4IUJMGOQzQIzoHF+McCeBoLyIgnLLP PCbJzZFNUv/Ipzjhf6CHphLtBZ65RUZXrM2/RBF3dtONmfJeeOaa5vTtt1YI1bAxXGpi AmSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=2cyaS4gO5h/F5vHUL0nItZes1zeuwWKpTfH3a+yaz5w=; b=2mqMMr1zbCSvKDTuIZqZYY99qZWF/LOHEQsuDYrq38POwFrlbsl7081Nghn6RZKlra UXUHnT8UWqtDQ2fJqcaplUNIuouX9zZmePL55KXII1E0wNgY25+oL6Vyup+s0lH8wvyR 4E9B/GJbfGDlxr7xmkD6onpYH+6HJbMeEVKATNnPZgD4QulFeOl4Bg9y+qNpCG+AZUmn RO12AfliC4EERPB241hHc4y3O1Q5D8tBi6eLWqHf69w6J25zICxZpVWP8nRauR/qnEXx l43gsG/y36gCGz1/R0hsxtbK+ApP6OWezY2R/xw+F+f8q4WJWLDyJszWr80TVBjZNNEU 1nQg== X-Gm-Message-State: ACgBeo3dbN8gth+/DFlazSdIejCWJg6i167IJ+7kvKvEYfsEDndMl0Jm CJQzdM/8HyWLDQ786GGZhI8= X-Google-Smtp-Source: AA6agR67xjcbz9YssVZFaI8NDUZdIsFHzxvsfzy5U3bGg476A1aMTgqPfJIx9JS4SnwCJtxOJvAxRw== X-Received: by 2002:a17:907:1c8a:b0:6e9:2a0d:d7b7 with SMTP id nb10-20020a1709071c8a00b006e92a0dd7b7mr349449ejc.572.1661372076524; Wed, 24 Aug 2022 13:14:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id k23-20020a17090632d700b00722e50dab2csm1559660ejk.109.2022.08.24.13.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 13:14:36 -0700 (PDT) Date: Wed, 24 Aug 2022 22:14:34 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] staging: rtl8192e: Remove blank lines in rtl_core.c Message-ID: <32e831619a91f00cc37e04a2da1a9aeda2ad90a0.1661370978.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 blank lines as requested by checkpatch. Reasons are "multiple blank lines", "Blank lines aren't necessary after an open brace" and "Blank lines aren't necessary before a close brace". Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index b9ce71848023..5b3b215448bc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -25,7 +25,6 @@ int hwwep =3D 1; static char *ifname =3D "wlan%d"; =20 - static const struct rtl819x_ops rtl819xp_ops =3D { .nic_type =3D NIC_8192E, .get_eeprom_size =3D rtl92e_get_eeprom_size, @@ -189,7 +188,6 @@ bool rtl92e_set_rf_state(struct net_device *dev, priv->rtllib->RfOffReason =3D 0; bActionAllowed =3D true; =20 - if (rtState =3D=3D eRfOff && ChangeSource >=3D RF_CHANGE_BY_HW) bConnectBySSID =3D true; @@ -236,7 +234,6 @@ bool rtl92e_set_rf_state(struct net_device *dev, __func__, StateToSet, priv->rtllib->RfOffReason); PHY_SetRFPowerState(dev, StateToSet); if (StateToSet =3D=3D eRfOn) { - if (bConnectBySSID && priv->blinked_ingpio) { schedule_delayed_work( &ieee->associate_procedure_wq, 0); @@ -395,7 +392,6 @@ static void _rtl92e_qos_activate(void *data) for (i =3D 0; i < QOS_QUEUE_NUM; i++) priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i)); =20 - success: mutex_unlock(&priv->mutex); } @@ -455,7 +451,6 @@ static int _rtl92e_handle_beacon(struct net_device *dev, =20 schedule_delayed_work(&priv->update_beacon_wq, 0); return 0; - } =20 static int _rtl92e_qos_assoc_resp(struct r8192_priv *priv, @@ -883,7 +878,6 @@ static void _rtl92e_init_priv_constant(struct net_devic= e *dev) pPSC->RegMaxLPSAwakeIntvl =3D 5; } =20 - static void _rtl92e_init_priv_variable(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -1201,7 +1195,6 @@ static enum reset_type _rtl92e_if_check_reset(struct = net_device *dev) } else { return RESET_TYPE_NORESET; } - } =20 static void _rtl92e_if_silent_reset(struct net_device *dev) @@ -1407,7 +1400,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) ieee->LinkDetectInfo.NumTxOkInPeriod > 100) bBusyTraffic =3D true; =20 - if (ieee->LinkDetectInfo.NumRxOkInPeriod > 4000 || ieee->LinkDetectInfo.NumTxOkInPeriod > 4000) { bHigherBusyTraffic =3D true; @@ -1456,7 +1448,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) else priv->check_roaming_cnt =3D 0; =20 - if (priv->check_roaming_cnt > 0) { if (ieee->eRFPowerState =3D=3D eRfOff) netdev_info(dev, "%s(): RF is off\n", __func__); @@ -1487,7 +1478,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) } ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 0; ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 0; - } =20 spin_lock_irqsave(&priv->tx_lock, flags); @@ -1541,7 +1531,6 @@ void rtl92e_tx_enable(struct net_device *dev) rtllib_reset_queue(priv->rtllib); } =20 - static void _rtl92e_free_rx_ring(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -1936,13 +1925,11 @@ long rtl92e_translate_to_dbm(struct r8192_priv *pri= v, u8 signal_strength_index) return signal_power; } =20 - void rtl92e_update_rx_statistics(struct r8192_priv *priv, struct rtllib_rx_stats *pprevious_stats) { int weighting =3D 0; =20 - if (priv->stats.recv_signal_power =3D=3D 0) priv->stats.recv_signal_power =3D pprevious_stats->RecvSignalPower; @@ -1985,8 +1972,6 @@ void rtl92e_copy_mpdu_stats(struct rtllib_rx_stats *p= src_stats, ptarget_stats->bFirstMPDU =3D psrc_stats->bFirstMPDU; } =20 - - static void _rtl92e_rx_normal(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -2086,7 +2071,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) priv->rx_idx[rx_queue_idx] =3D (priv->rx_idx[rx_queue_idx] + 1) % priv->rxringcount; } - } =20 static void _rtl92e_tx_resume(struct net_device *dev) @@ -2151,7 +2135,6 @@ static int _rtl92e_open(struct net_device *dev) ret =3D _rtl92e_try_up(dev); mutex_unlock(&priv->wx_mutex); return ret; - } =20 static int _rtl92e_try_up(struct net_device *dev) @@ -2163,7 +2146,6 @@ static int _rtl92e_try_up(struct net_device *dev) return _rtl92e_up(dev, false); } =20 - static int _rtl92e_close(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -2181,7 +2163,6 @@ static int _rtl92e_close(struct net_device *dev) mutex_unlock(&priv->wx_mutex); =20 return ret; - } =20 static int _rtl92e_down(struct net_device *dev, bool shutdownrf) @@ -2224,10 +2205,8 @@ static void _rtl92e_set_multicast(struct net_device = *dev) =20 promisc =3D (dev->flags & IFF_PROMISC) ? 1 : 0; priv->promisc =3D promisc; - } =20 - static int _rtl92e_set_mac_adr(struct net_device *dev, void *mac) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -2376,8 +2355,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) return IRQ_HANDLED; } =20 - - /*************************************************************************= *** * ---------------------------- PCI_STUFF--------------------------- *************************************************************************= ***/ @@ -2452,7 +2429,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, goto err_rel_rtllib; } =20 - ioaddr =3D (unsigned long)ioremap(pmem_start, pmem_len); if (ioaddr =3D=3D (unsigned long)NULL) { netdev_err(dev, "ioremap failed!"); --=20 2.37.2 From nobody Sat Apr 11 14:00:31 2026 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 C6932C04AA5 for ; Wed, 24 Aug 2022 20:14:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240254AbiHXUOu (ORCPT ); Wed, 24 Aug 2022 16:14:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240246AbiHXUOq (ORCPT ); Wed, 24 Aug 2022 16:14:46 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6EA07C526 for ; Wed, 24 Aug 2022 13:14:42 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id w20so7732138edd.10 for ; Wed, 24 Aug 2022 13:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=O2auyW/wyuCTRZgooWa2O9OlE4D4l/s1oCdHs9nl/AM=; b=RkCHIIr13O8y6XDImqeVhXCvTCViIgq/I2Q9U83Sp0NchD+XeBv2fybJXTkGfGkJlf LxlTt3dqw8JKKkNTzmyAjX4aWDkQFDQNDc4E/2Wkwr4HL3bk6RV1NhrbHCvPcRZZ0t0m yFdBK75Yo2yHfwHs1aB0+DYF20JLsbIkbR6b1K2BddFl4jXyJN4P0jIEKKZDQ7Yn1iL5 pSOyD0v+rao59R7MStWhXYQRT9fryjqbn62BaF1dZ9PCaau2iTgAlOwBlfDG6UMkVHl9 X6J0Sxag1N3Ci8eeyKEZwT7taN5pyzBGCf7kXURgHZH485MibCy8FSorTkaRik0PuAQ0 jBGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=O2auyW/wyuCTRZgooWa2O9OlE4D4l/s1oCdHs9nl/AM=; b=NVGYhDs9CUm0z4CZ/PCd9vKAyTGA8K3e3JwgGezP9yl+cV5vCprwd5ZpImpMqT2lL7 2ULzLgEFrpI4O1JHwz7VZeZwYC4Ppx0gr2oL2HLRTP6xwIN8dtFPM53Yzli2qRcTIH7+ g7SzqlZxw0eUD4OG8ikTky0LwqxB0p/Y6eCOQdAALIpcrBk/WVrOLikJAGq8jmVXJ4SI G8NdJhKtl0EpaFM84cKcqceOnUPjxPXNhH1kPkF6rgAVCwTCOI6oWNXk6WgXqEJM+96F u/aMEhnx3zBJK0My9Chme7ZO36XciUedV6uGH0nBU0V9cbU/4h3986WN8A/jzZNQRle8 3FMg== X-Gm-Message-State: ACgBeo3Ik6cAuESWrlzZNAuFcLox0tmot1EEBGpFUtDbDDGJrbvYqFQ0 7SSUhSgDP/gkmAqcbmdgMVF5I9R4DG4= X-Google-Smtp-Source: AA6agR4yvrNf2nypLiV3+GroLzz/CEDa+5vK7a01KJMJogU8vyj0ZhI/1cLv6KwFgeFEqkd9NAWPXg== X-Received: by 2002:a05:6402:328c:b0:446:bcc8:bf49 with SMTP id f12-20020a056402328c00b00446bcc8bf49mr522360eda.309.1661372081382; Wed, 24 Aug 2022 13:14:41 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id d26-20020a50cd5a000000b0044758c9b951sm2220907edj.79.2022.08.24.13.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 13:14:41 -0700 (PDT) Date: Wed, 24 Aug 2022 22:14:39 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] staging: rtl8192e: Rename Tx... and RxCheckStuckHandler Message-ID: <3041cec77df10cdff18d5466beb3b0616370b112.1661370978.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" Variable name TxCheckStuckHandler and RxCheckStuckHandler is changed to avoid CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 5b3b215448bc..ff73b8cff5e8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -43,8 +43,8 @@ static const struct rtl819x_ops rtl819xp_ops =3D { .rx_enable =3D rtl92e_enable_rx, .tx_enable =3D rtl92e_enable_tx, .interrupt_recognized =3D rtl92e_ack_irq, - .TxCheckStuckHandler =3D rtl92e_is_tx_stuck, - .RxCheckStuckHandler =3D rtl92e_is_rx_stuck, + .tx_check_stuck_handler =3D rtl92e_is_tx_stuck, + .rx_check_stuck_handler =3D rtl92e_is_rx_stuck, }; =20 static struct pci_device_id rtl8192_pci_id_tbl[] =3D { @@ -1143,7 +1143,7 @@ static enum reset_type _rtl92e_tx_check_stuck(struct = net_device *dev) spin_unlock_irqrestore(&priv->irq_th_lock, flags); =20 if (bCheckFwTxCnt) { - if (priv->ops->TxCheckStuckHandler(dev)) { + if (priv->ops->tx_check_stuck_handler(dev)) { RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no Tx condition!\n"); return RESET_TYPE_SILENT; @@ -1157,7 +1157,7 @@ static enum reset_type _rtl92e_rx_check_stuck(struct = net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - if (priv->ops->RxCheckStuckHandler(dev)) { + if (priv->ops->rx_check_stuck_handler(dev)) { RT_TRACE(COMP_RESET, "RxStuck Condition\n"); return RESET_TYPE_SILENT; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 698552a92100..8f254c34d5d3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -299,8 +299,8 @@ struct rtl819x_ops { void (*tx_enable)(struct net_device *dev); void (*interrupt_recognized)(struct net_device *dev, u32 *p_inta, u32 *p_intb); - bool (*TxCheckStuckHandler)(struct net_device *dev); - bool (*RxCheckStuckHandler)(struct net_device *dev); + bool (*tx_check_stuck_handler)(struct net_device *dev); + bool (*rx_check_stuck_handler)(struct net_device *dev); }; =20 struct r8192_priv { --=20 2.37.2 From nobody Sat Apr 11 14:00:31 2026 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 966E7C48BE4 for ; Wed, 24 Aug 2022 20:15:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240260AbiHXUPG (ORCPT ); Wed, 24 Aug 2022 16:15:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240262AbiHXUOw (ORCPT ); Wed, 24 Aug 2022 16:14:52 -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 8AEE4E95 for ; Wed, 24 Aug 2022 13:14:47 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id j21so30243290ejs.0 for ; Wed, 24 Aug 2022 13:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=cg3PC67R0j4dHQzEfUx9lu7ubVMa5PfU8Aw1mhXuvVA=; b=nmrx/HiLuVmAieSxcbFe0NogtAI2bA9lATJ9NHSck8s+cWbs+bdAvAvIXvJsauwu2e YHnzVcktMNvKyqEKjg8tIVUnA4KmOSfBtJcOj4naR/buLlUdVAuDT+1vaFO/yJOTsoEi eDWCLS1euQK0XESymumu2YhJe58/X2Rzq96bnn8jwH8IpasEesbH+SyZErmBTYZ8Jj4X FeXAv2K1edEGAIouI6A0kZjxhLnbnfFVJE0+bsRcovXzwOW/wt4WHG/BJSGcLVhYUaop A4a9LyyZNi/O+eVi42q3STL53AefwEOYLj5l9AcZIbXI6schXxJ0IYx5VgJtbEqmwcSa d9zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=cg3PC67R0j4dHQzEfUx9lu7ubVMa5PfU8Aw1mhXuvVA=; b=YeikvTwZb6ikQ22DhxdYsITmYpWAKOSK29i/ZOsf9RWikkBGVMVpHgQeN/5Jvk513c qV4+QtceyPz+05++5rWSx8OrbezrY1n0c251zLYsCeMNbADViWqqbGfeg1THNVGoCsJH uYtM3C7eIhjCPpkuZMtL41gD1zY4cpQihsf5QJAwY8W2OO9IOmr0hdcBqLPRf1Prl94A WQvkGdOGfjUo68ZoBqpgN8zHQVe7zzH2H5gODECdNaOjP3zoBWh11e8rj51oQ0egioWM V1wvVN6IDefaMAq+dNTkXnn9DMqiiHwftEku1x0OhwS4ph29BmQcEZf/5tPMFbaT5s3o Oe2g== X-Gm-Message-State: ACgBeo2km+Ex7qYbWJmqPM6aCLTNj2/DKL/ZW295jIKon1Cis2esaYgc pA8whRYSweyE+FscJ9RYbVc= X-Google-Smtp-Source: AA6agR7nNU+EIPOu+YgWq0dufAR0llgYfwAxdUiH4TfFIN78TSMyaFt/DFa9xEx0xJVFfNabmrMdww== X-Received: by 2002:a17:907:7f22:b0:73d:6e2e:5bb8 with SMTP id qf34-20020a1709077f2200b0073d6e2e5bb8mr376127ejc.642.1661372085979; Wed, 24 Aug 2022 13:14:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id gg19-20020a170906899300b0073cb0801104sm1561585ejc.147.2022.08.24.13.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 13:14:45 -0700 (PDT) Date: Wed, 24 Aug 2022 22:14:43 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] staging: rtl8192e: Remove Unnecessary ftrace-like logging Message-ID: <5240b86941ebf3a290d384744d117d436e7bad41.1661370978.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 "Unnecessary ftrace-like logging" as requested by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 130 ++----------------- 1 file changed, 9 insertions(+), 121 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index ff73b8cff5e8..8462dd9859e8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -143,22 +143,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, u16 RFWaitCounter =3D 0; unsigned long flag; =20 - RT_TRACE((COMP_PS | COMP_RF), - "=3D=3D=3D>%s: StateToSet(%d)\n", __func__, StateToSet); - while (true) { spin_lock_irqsave(&priv->rf_ps_lock, flag); if (priv->RFChangeInProgress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - RT_TRACE((COMP_PS | COMP_RF), - "%s: RF Change in progress! Wait to set..StateToSet(%d).\n", - __func__, StateToSet); =20 while (priv->RFChangeInProgress) { RFWaitCounter++; - RT_TRACE((COMP_PS | COMP_RF), - "%s: Wait 1 ms (%d times)...\n", - __func__, RFWaitCounter); mdelay(1); =20 if (RFWaitCounter > 100) { @@ -191,12 +182,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, if (rtState =3D=3D eRfOff && ChangeSource >=3D RF_CHANGE_BY_HW) bConnectBySSID =3D true; - } else { - RT_TRACE((COMP_PS | COMP_RF), - "%s - eRfon reject pMgntInfo->RfOffReason=3D 0x%x, ChangeSource=3D0x%= X\n", - __func__, priv->rtllib->RfOffReason, ChangeSource); - } - + } break; =20 case eRfOff: @@ -229,9 +215,6 @@ bool rtl92e_set_rf_state(struct net_device *dev, } =20 if (bActionAllowed) { - RT_TRACE((COMP_PS | COMP_RF), - "%s: Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n", - __func__, StateToSet, priv->rtllib->RfOffReason); PHY_SetRFPowerState(dev, StateToSet); if (StateToSet =3D=3D eRfOn) { if (bConnectBySSID && priv->blinked_ingpio) { @@ -240,17 +223,11 @@ bool rtl92e_set_rf_state(struct net_device *dev, priv->blinked_ingpio =3D false; } } - } else { - RT_TRACE((COMP_PS | COMP_RF), - "%s: Action is rejected.... StateToSet(%d), ChangeSource(%#X), RfOffRe= ason(%#X)\n", - __func__, StateToSet, ChangeSource, priv->rtllib->RfOffReason); } =20 spin_lock_irqsave(&priv->rf_ps_lock, flag); priv->RFChangeInProgress =3D false; spin_unlock_irqrestore(&priv->rf_ps_lock, flag); - - RT_TRACE((COMP_PS | COMP_RF), "<=3D=3D=3D%s\n", __func__); return bActionAllowed; } =20 @@ -294,7 +271,6 @@ static void _rtl92e_set_chan(struct net_device *dev, sh= ort ch) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - RT_TRACE(COMP_CH, "=3D=3D=3D=3D=3D>%s()=3D=3D=3D=3Dch:%d\n", __func__, ch= ); if (priv->chan_forced) return; =20 @@ -314,9 +290,6 @@ static void _rtl92e_update_cap(struct net_device *dev, = u16 cap) if (priv->dot11CurrentPreambleMode !=3D PREAMBLE_SHORT) { ShortPreamble =3D true; priv->dot11CurrentPreambleMode =3D PREAMBLE_SHORT; - RT_TRACE(COMP_DBG, - "%s(): WLAN_CAPABILITY_SHORT_PREAMBLE\n", - __func__); priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble); } @@ -324,9 +297,6 @@ static void _rtl92e_update_cap(struct net_device *dev, = u16 cap) if (priv->dot11CurrentPreambleMode !=3D PREAMBLE_LONG) { ShortPreamble =3D false; priv->dot11CurrentPreambleMode =3D PREAMBLE_LONG; - RT_TRACE(COMP_DBG, - "%s(): WLAN_CAPABILITY_LONG_PREAMBLE\n", - __func__); priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble); } @@ -386,8 +356,6 @@ static void _rtl92e_qos_activate(void *data) mutex_lock(&priv->mutex); if (priv->rtllib->state !=3D RTLLIB_LINKED) goto success; - RT_TRACE(COMP_QOS, - "qos active process with associate response received\n"); =20 for (i =3D 0; i < QOS_QUEUE_NUM; i++) priv->rtllib->SetHwRegHandler(dev, HW_VAR_AC_PARAM, (u8 *)(&i)); @@ -422,18 +390,14 @@ static int _rtl92e_qos_handle_probe_response(struct r= 8192_priv *priv, network->qos_data.param_count; priv->rtllib->wmm_acm =3D network->qos_data.wmm_acm; schedule_work(&priv->qos_activate); - RT_TRACE(COMP_QOS, - "QoS parameters change call qos_activate\n"); } } else { memcpy(&priv->rtllib->current_network.qos_data.parameters, &def_qos_parameters, size); =20 - if ((network->qos_data.active =3D=3D 1) && (active_network =3D=3D 1)) { + if ((network->qos_data.active =3D=3D 1) && (active_network =3D=3D 1)) schedule_work(&priv->qos_activate); - RT_TRACE(COMP_QOS, - "QoS was disabled call qos_activate\n"); - } + network->qos_data.active =3D 0; network->qos_data.supported =3D 0; } @@ -491,8 +455,6 @@ static int _rtl92e_qos_assoc_resp(struct r8192_priv *pr= iv, =20 spin_unlock_irqrestore(&priv->rtllib->lock, flags); =20 - RT_TRACE(COMP_QOS, "%s: network->flags =3D %d,%d\n", __func__, - network->flags, priv->rtllib->current_network.qos_data.active); if (set_qos_param =3D=3D 1) { rtl92e_dm_init_edca_turbo(priv->rtllib->dev); schedule_work(&priv->qos_activate); @@ -711,15 +673,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, = u8 wireless_mode) if ((wireless_mode =3D=3D WIRELESS_MODE_N_24G) || (wireless_mode =3D=3D WIRELESS_MODE_N_5G)) { priv->rtllib->pHTInfo->bEnableHT =3D 1; - RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT =3D 1\n", - __func__, wireless_mode); } else { priv->rtllib->pHTInfo->bEnableHT =3D 0; - RT_TRACE(COMP_DBG, "%s(), wireless_mode:%x, bEnableHT =3D 0\n", - __func__, wireless_mode); } - - RT_TRACE(COMP_INIT, "Current Wireless Mode is %x\n", wireless_mode); _rtl92e_refresh_support_rate(priv); } =20 @@ -737,7 +693,6 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) priv->rtllib->ieee_up =3D 1; =20 priv->up_first_time =3D 0; - RT_TRACE(COMP_INIT, "Bringing up iface"); priv->bfirst_init =3D true; init_status =3D priv->ops->initialize_adapter(dev); if (!init_status) { @@ -746,7 +701,6 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) return -1; } =20 - RT_TRACE(COMP_INIT, "start adapter finished\n"); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 @@ -785,7 +739,6 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) priv->up =3D 0; priv->rtllib->ieee_up =3D 0; priv->bfirst_after_down =3D true; - RT_TRACE(COMP_DOWN, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s()\n", __func__); if (!netif_queue_stopped(dev)) netif_stop_queue(dev); =20 @@ -808,9 +761,6 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) spin_lock_irqsave(&priv->rf_ps_lock, flags); break; } - RT_TRACE(COMP_DBG, - "=3D=3D=3D>%s():RF is in progress, need to wait until rf change is don= e.\n", - __func__); mdelay(1); RFInProgressTimeOut++; spin_lock_irqsave(&priv->rf_ps_lock, flags); @@ -824,7 +774,6 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) udelay(100); memset(&priv->rtllib->current_network, 0, offsetof(struct rtllib_network, list)); - RT_TRACE(COMP_DOWN, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D%s()\n", __func__); =20 return 0; } @@ -1026,7 +975,6 @@ static short _rtl92e_get_channel_map(struct net_device= *dev) "rtl819x_init:Error channel plan! Set to default.\n"); priv->ChannelPlan =3D COUNTRY_CODE_FCC; } - RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan); dot11d_init(priv->rtllib); dot11d_channel_map(priv->ChannelPlan, priv->rtllib); for (i =3D 1; i <=3D 11; i++) @@ -1066,7 +1014,6 @@ static short _rtl92e_init(struct net_device *dev) } =20 priv->irq =3D dev->irq; - RT_TRACE(COMP_INIT, "IRQ %d\n", dev->irq); =20 if (_rtl92e_pci_initdescring(dev) !=3D 0) { netdev_err(dev, "Endopoints initialization failed"); @@ -1143,11 +1090,8 @@ static enum reset_type _rtl92e_tx_check_stuck(struct= net_device *dev) spin_unlock_irqrestore(&priv->irq_th_lock, flags); =20 if (bCheckFwTxCnt) { - if (priv->ops->tx_check_stuck_handler(dev)) { - RT_TRACE(COMP_RESET, - "TxCheckStuck(): Fw indicates no Tx condition!\n"); + if (priv->ops->tx_check_stuck_handler(dev)) return RESET_TYPE_SILENT; - } } =20 return RESET_TYPE_NORESET; @@ -1157,10 +1101,8 @@ static enum reset_type _rtl92e_rx_check_stuck(struct= net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - if (priv->ops->rx_check_stuck_handler(dev)) { - RT_TRACE(COMP_RESET, "RxStuck Condition\n"); + if (priv->ops->rx_check_stuck_handler(dev)) return RESET_TYPE_SILENT; - } =20 return RESET_TYPE_NORESET; } @@ -1206,9 +1148,6 @@ static void _rtl92e_if_silent_reset(struct net_device= *dev) unsigned long flag; =20 if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { - - RT_TRACE(COMP_RESET, "=3D=3D=3D=3D=3D=3D=3D=3D=3D>Reset progress!!\n"); - priv->ResetProgress =3D RESET_TYPE_SILENT; =20 spin_lock_irqsave(&priv->rf_ps_lock, flag); @@ -1235,12 +1174,7 @@ static void _rtl92e_if_silent_reset(struct net_devic= e *dev) } priv->up =3D 0; =20 - RT_TRACE(COMP_RESET, "%s():=3D=3D=3D=3D=3D=3D>start to down the driver\n= ", - __func__); mdelay(1000); - RT_TRACE(COMP_RESET, - "%s():111111111111111111111111=3D=3D=3D=3D=3D=3D>start to down the dri= ver\n", - __func__); =20 if (!netif_queue_stopped(dev)) netif_stop_queue(dev); @@ -1268,16 +1202,8 @@ static void _rtl92e_if_silent_reset(struct net_devic= e *dev) rtl92e_dm_backup_state(dev); =20 mutex_unlock(&priv->wx_mutex); - RT_TRACE(COMP_RESET, - "%s():<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3Ddown process is finished\n", - __func__); - - RT_TRACE(COMP_RESET, "%s():<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3Dup process = start\n", - __func__); reset_status =3D _rtl92e_up(dev, true); =20 - RT_TRACE(COMP_RESET, - "%s():<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3Dup process is finished\n", __f= unc__); if (reset_status =3D=3D -1) { if (reset_times < 3) { reset_times++; @@ -1326,8 +1252,6 @@ static void _rtl92e_if_silent_reset(struct net_device= *dev) priv->bResetInProgress =3D false; =20 rtl92e_writeb(dev, UFWP, 1); - RT_TRACE(COMP_RESET, "Reset finished!! =3D=3D=3D=3D>[%d]\n", - priv->reset_count); } } =20 @@ -1388,8 +1312,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) if ((ieee->PowerSaveControl.ReturnPoint =3D=3D IPS_CALLBACK_NONE) && (!ieee->bNetPromiscuousMode)) { - RT_TRACE(COMP_PS, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>haha: = rtl92e_ips_enter()\n"); rtl92e_ips_enter(dev); } } @@ -1425,7 +1347,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) rtl92e_leisure_ps_leave(dev); =20 } else { - RT_TRACE(COMP_LPS, "=3D=3D=3D=3D>no link LPS leave\n"); rtl92e_leisure_ps_leave(dev); } =20 @@ -1490,7 +1411,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) =20 if (!priv->bDisableNormalResetCheck && ResetType =3D=3D RESET_TYPE_NORMAL= ) { priv->ResetProgress =3D RESET_TYPE_NORMAL; - RT_TRACE(COMP_RESET, "%s(): NOMAL RESET\n", __func__); return; } =20 @@ -1500,7 +1420,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) priv->force_reset =3D false; priv->bForcedSilentReset =3D false; priv->bResetInProgress =3D false; - RT_TRACE(COMP_TRACE, " <=3D=3DRtUsbCheckForHangWorkItemCallback()\n"); } =20 static void _rtl92e_watchdog_timer_cb(struct timer_list *t) @@ -2257,21 +2176,13 @@ static irqreturn_t _rtl92e_irq(int irq, void *netde= v) goto done; } =20 - if (inta & IMR_TBDOK) { - RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); + if (inta & IMR_TBDOK) priv->stats.txbeaconokint++; - } =20 - if (inta & IMR_TBDER) { - RT_TRACE(COMP_INTR, "beacon ok interrupt!\n"); + if (inta & IMR_TBDER) priv->stats.txbeaconerr++; - } - - if (inta & IMR_BDOK) - RT_TRACE(COMP_INTR, "beacon interrupt!\n"); =20 if (inta & IMR_MGNTDOK) { - RT_TRACE(COMP_INTR, "Manage ok interrupt!\n"); priv->stats.txmanageokint++; _rtl92e_tx_isr(dev, MGNT_QUEUE); spin_unlock_irqrestore(&priv->irq_th_lock, flags); @@ -2298,13 +2209,10 @@ static irqreturn_t _rtl92e_irq(int irq, void *netde= v) tasklet_schedule(&priv->irq_rx_tasklet); } =20 - if (inta & IMR_BcnInt) { - RT_TRACE(COMP_INTR, "prepare beacon for interrupt!\n"); + if (inta & IMR_BcnInt) tasklet_schedule(&priv->irq_prepare_beacon_tasklet); - } =20 if (inta & IMR_RDU) { - RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n"); priv->stats.rxrdu++; rtl92e_writel(dev, INTA_MASK, rtl92e_readl(dev, INTA_MASK) & ~IMR_RDU); @@ -2312,7 +2220,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) } =20 if (inta & IMR_RXFOVW) { - RT_TRACE(COMP_INTR, "rx overflow !\n"); priv->stats.rxoverflow++; tasklet_schedule(&priv->irq_rx_tasklet); } @@ -2321,21 +2228,18 @@ static irqreturn_t _rtl92e_irq(int irq, void *netde= v) priv->stats.txoverflow++; =20 if (inta & IMR_BKDOK) { - RT_TRACE(COMP_INTR, "BK Tx OK interrupt!\n"); priv->stats.txbkokint++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, BK_QUEUE); } =20 if (inta & IMR_BEDOK) { - RT_TRACE(COMP_INTR, "BE TX OK interrupt!\n"); priv->stats.txbeokint++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, BE_QUEUE); } =20 if (inta & IMR_VIDOK) { - RT_TRACE(COMP_INTR, "VI TX OK interrupt!\n"); priv->stats.txviokint++; priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, VI_QUEUE); @@ -2343,7 +2247,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) =20 if (inta & IMR_VODOK) { priv->stats.txvookint++; - RT_TRACE(COMP_INTR, "Vo TX OK interrupt!\n"); priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, VO_QUEUE); } @@ -2379,8 +2282,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, int err =3D -ENOMEM; u8 revision_id; =20 - RT_TRACE(COMP_INIT, "Configuring chip resources"); - if (pci_enable_device(pdev)) { dev_err(&pdev->dev, "Failed to enable PCI device"); return -EIO; @@ -2459,13 +2360,9 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, dev->type =3D ARPHRD_ETHER; dev->watchdog_timeo =3D HZ * 3; =20 - if (dev_alloc_name(dev, ifname) < 0) { - RT_TRACE(COMP_INIT, - "Oops: devname already taken! Trying wlan%%d...\n"); + if (dev_alloc_name(dev, ifname) < 0) dev_alloc_name(dev, ifname); - } =20 - RT_TRACE(COMP_INIT, "Driver probe completed1\n"); if (_rtl92e_init(dev) !=3D 0) { netdev_warn(dev, "Initialization failed"); goto err_free_irq; @@ -2476,12 +2373,10 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, =20 if (register_netdev(dev)) goto err_free_irq; - RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name); =20 if (priv->polling_timer_on =3D=3D 0) rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer); =20 - RT_TRACE(COMP_INIT, "Driver probe completed\n"); return 0; =20 err_free_irq: @@ -2536,7 +2431,6 @@ static void _rtl92e_pci_disconnect(struct pci_dev *pd= ev) } =20 pci_disable_device(pdev); - RT_TRACE(COMP_DOWN, "wlan driver removed\n"); } =20 bool rtl92e_enable_nic(struct net_device *dev) @@ -2552,7 +2446,6 @@ bool rtl92e_enable_nic(struct net_device *dev) return false; } =20 - RT_TRACE(COMP_PS, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s()\n", __func__); priv->bfirst_init =3D true; init_status =3D priv->ops->initialize_adapter(dev); if (!init_status) { @@ -2560,13 +2453,11 @@ bool rtl92e_enable_nic(struct net_device *dev) priv->bdisable_nic =3D false; return false; } - RT_TRACE(COMP_INIT, "start adapter finished\n"); RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 rtl92e_irq_enable(dev); priv->bdisable_nic =3D false; - RT_TRACE(COMP_PS, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D%s()\n", __func__); return init_status; } =20 @@ -2575,7 +2466,6 @@ bool rtl92e_disable_nic(struct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); u8 tmp_state =3D 0; =20 - RT_TRACE(COMP_PS, "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s()\n", __func__); priv->bdisable_nic =3D true; tmp_state =3D priv->rtllib->state; rtllib_softmac_stop_protocol(priv->rtllib, 0, false); @@ -2584,8 +2474,6 @@ bool rtl92e_disable_nic(struct net_device *dev) rtl92e_irq_disable(dev); =20 priv->ops->stop_adapter(dev, false); - RT_TRACE(COMP_PS, "<=3D=3D=3D=3D=3D=3D=3D=3D=3D%s()\n", __func__); - return true; } =20 --=20 2.37.2 From nobody Sat Apr 11 14:00:31 2026 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 F0C6EC04AA5 for ; Wed, 24 Aug 2022 20:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240309AbiHXUPK (ORCPT ); Wed, 24 Aug 2022 16:15:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240289AbiHXUPC (ORCPT ); Wed, 24 Aug 2022 16:15:02 -0400 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 8C293242 for ; Wed, 24 Aug 2022 13:14:52 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id gb36so35607907ejc.10 for ; Wed, 24 Aug 2022 13:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc; bh=sCUiS3qiw3P6R4sjn2bcDl99oRoA2UGJKOoJt3+JSec=; b=Bi819f3gUZDOPgJw2U8A49ZkwWSBtWfd/+naWC8bEfp/HM3LI8goZYgxsUpetzz6SV wZvDH+SoKvP2UmDUE0EN+JKjp69xOcNP/PjliDFz0cLEIionrE9vfTj0cKdEJ5oTbzvj BZMqLYjs2Q+T8TBFUzDeDADakyT5+Qtk9eJ5Pl+wo7/ixVFDw+JKxDxVtrUnCBbd+IcO EPoV6dbfD5CtfgAulsq/oamI5Qb1r3Y1/12yS1erWEv1egaN6BE7pdm4WfMHuv7Uppfy wL1jiGcnaTHyLkjl83vB32d6O2acsVSSPCHBtdS7oJQQbSvRF1K/6xV2+jSlVAF5/sz0 mqqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc; bh=sCUiS3qiw3P6R4sjn2bcDl99oRoA2UGJKOoJt3+JSec=; b=FV2zgztW2WcsjpUDxmJNTUkvEZW5ujY2jrB/1inxs3jqtmwxfVf6jThjdfc7dJydlb cfisd6tCaoHjpyPEVddzPWbae5rLZqfBjHP4n163kMLWNcSWRLl/XrFDL22h653hz9mJ 2t9TcUFRp/W61JRZs2oe9qgzn37TbfsDyCV1W5M++0wOznvjJngUgYXIoQri+L4X25U/ Cxil/jW/w936QdhgHgwQuMBdP9Mq6wM3llJNS9Wxk/kmqDinx5wjwl1MSmmWffSFhCG+ TwBU2nW143VxczKw8pX1HA0HTgZDUTwLxkPJ21a1RM5Xs66gYFw/9/X0Y5guWXpeIT9k LLYQ== X-Gm-Message-State: ACgBeo2KKt0JqLzxibMyWV5DGccwUecs77e1hrvWh74k+efNe80sVKMg Ug6bGLBFQCgLulIUpY6sCnk= X-Google-Smtp-Source: AA6agR5xOzz3SUzOnzLS+/oGLHJTfUQlp6XyTO9qciBJaUBYfGPLUJWQvN3ZxWJZnBW6D6zXesAQfw== X-Received: by 2002:a17:907:2cc1:b0:73d:c2d9:3232 with SMTP id hg1-20020a1709072cc100b0073dc2d93232mr353713ejc.763.1661372091156; Wed, 24 Aug 2022 13:14:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a07b82.dip0.t-ipconnect.de. [84.160.123.130]) by smtp.gmail.com with ESMTPSA id z6-20020a17090665c600b0073d70df6e56sm1525023ejn.138.2022.08.24.13.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 13:14:50 -0700 (PDT) Date: Wed, 24 Aug 2022 22:14:49 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] staging: rtl8192e: Remove PHY_SetRFPowerState and rename StateToSet 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 macro that replaces PHY_SetRFPowerState with rtl92e_set_rf_power_state and rename StateToSet to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 7c9148e033d8..7f2a24b72e52 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -83,7 +83,6 @@ void rtl92e_set_rf_off(struct net_device *dev); =20 bool rtl92e_set_rf_power_state(struct net_device *dev, enum rt_rf_power_state eRFPowerState); -#define PHY_SetRFPowerState rtl92e_set_rf_power_state =20 void rtl92e_scan_op_backup(struct net_device *dev, u8 Operation); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 8462dd9859e8..5ac4817909df 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -132,7 +132,7 @@ void rtl92e_writew(struct net_device *dev, int x, u16 y) * -----------------------------GENERAL FUNCTION------------------------- *************************************************************************= ***/ bool rtl92e_set_rf_state(struct net_device *dev, - enum rt_rf_power_state StateToSet, + enum rt_rf_power_state state_to_set, RT_RF_CHANGE_SOURCE ChangeSource) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -168,7 +168,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, =20 rtState =3D priv->rtllib->eRFPowerState; =20 - switch (StateToSet) { + switch (state_to_set) { case eRfOn: priv->rtllib->RfOffReason &=3D (~ChangeSource); =20 @@ -215,8 +215,8 @@ bool rtl92e_set_rf_state(struct net_device *dev, } =20 if (bActionAllowed) { - PHY_SetRFPowerState(dev, StateToSet); - if (StateToSet =3D=3D eRfOn) { + rtl92e_set_rf_power_state(dev, state_to_set); + if (state_to_set =3D=3D eRfOn) { if (bConnectBySSID && priv->blinked_ingpio) { schedule_delayed_work( &ieee->associate_procedure_wq, 0); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 8f254c34d5d3..1796c881a5fa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -598,6 +598,6 @@ bool rtl92e_enable_nic(struct net_device *dev); bool rtl92e_disable_nic(struct net_device *dev); =20 bool rtl92e_set_rf_state(struct net_device *dev, - enum rt_rf_power_state StateToSet, + enum rt_rf_power_state state_to_set, RT_RF_CHANGE_SOURCE ChangeSource); #endif --=20 2.37.2