From patchwork Wed Jun 7 15:02:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yogesh Hegde X-Patchwork-Id: 104575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp280718vqr; Wed, 7 Jun 2023 08:24:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6oHC7Ql/MalktJuELNILCf7FGNKYn3UyuctwBy+kOV/WucCTc7NSoZOWbFYJv9g+DQA0LQ X-Received: by 2002:a05:6808:148:b0:398:5aee:77f7 with SMTP id h8-20020a056808014800b003985aee77f7mr3538924oie.12.1686151499049; Wed, 07 Jun 2023 08:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686151499; cv=none; d=google.com; s=arc-20160816; b=hqdu0Ck8grrgYN7LhPzUvb0Bs1JnZNU9L83Qbl+GelhAIUxfzMyOdIhb0HhQkllMg6 HpSDy/o2J4zgconuU262nOjpEGtndat1vd4a/iOZ7pjJH7Qk9JpSjiz7PgaeBibou5xJ 8SwoyS7Zdu8/aMB/Vsj3HTm3CSmjPUp0utq60v5Y6TtY/gJViQZ4cPieeLIqoGZ8iCLt 2WNy1TX2p5N2oh5YnQ+/rP2ZVw9Seu9nYKeg5HPIo4JJfLHj2puOEH4MaAJlFHA4ViKV jQUnVTCqi7PGuLDLrp4p9+j4RvqMvKvB4VGPQPHXGzVxvbdDE9Aof3F4tx7X7NEvSalu z4Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=b2ADMSx2umuqEvoBHVVXSUc2jdp3ipOUY5DdCNizpaM=; b=p7NF9P9apBPFjIBkRNw8I913b5a7UoEaB6oiSIOT+ZNvrhmoLgA1nCBq/2YtCXYVvJ ATYbe/SueEdxLYhPGvpGs0Hvrt9uNbNd2iXQZ+XSk4EWrO3VJK2gL5dB1MZtJrWZofdq /XLy7Pru3RFPjHs4O7CiQfXJki7roLsAYxsH0s3Vd1dFul7vehzEtnHxJyyoU8TxA1Gg HmmhunIR5KWTLTmRTUegdBT2TnWelCs59ReYK0b5FwKqIS/fHY4xhmjsk78gJ+E4xZJs beNunhcODH0tYmogX9ibPX7kqMWCG7j7qtCOtQZZw3w7XNJbz+fJOqltDTdw0vUpE0d0 nnow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ij1M2eNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oj14-20020a17090b4d8e00b0025698fca606si1243059pjb.109.2023.06.07.08.24.44; Wed, 07 Jun 2023 08:24:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ij1M2eNT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240463AbjFGPCt (ORCPT + 99 others); Wed, 7 Jun 2023 11:02:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241248AbjFGPCh (ORCPT ); Wed, 7 Jun 2023 11:02:37 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D18C91FCE for ; Wed, 7 Jun 2023 08:02:35 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-653f9c7b3e4so3246891b3a.2 for ; Wed, 07 Jun 2023 08:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686150155; x=1688742155; 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=b2ADMSx2umuqEvoBHVVXSUc2jdp3ipOUY5DdCNizpaM=; b=ij1M2eNTekSpxOUXRRF9mkoieb28xM8pDUyZvBwBHImPB/I8Dh23nA6BKXriRZHOBg sN2xUJ/8QIlJ3TOJ4LHh7Nz9FwqHC9qwA3Lt5DYd25lREOJbFEmRZCt1Z5C6R1IlcyLk wpKi9BygFhPohF7qI3PN5gFtAjf2yYO43QCg8CeHezxHbMn7CwFoeebEAKX29SS0s1gq k3ZP+QvEFKva1gko2SCEDopH92454YqJg4kie+gIAe1khkRCTDgkFUWs1KSWw17vYoqS deL5iF59WFlekjH6IXXOuVu/kx1IJlI87ByglKBI3h96jl4TicMuN/L38X+cBA+RkLo3 7G9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686150155; x=1688742155; 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=b2ADMSx2umuqEvoBHVVXSUc2jdp3ipOUY5DdCNizpaM=; b=ZX4emvEyGVzzgNksHJ5yiOmgt9fnfjTWfpQ+y/4MuRGPxSM7ta3Ra5AkCRA1lbiG93 r/s6DTCEjE1fpP4ZYouZnj0tPiEd5KHow3jM5M2shs0/fYU0MW7Z2Q7ZLgnjtWt6ODEw a4lcnnY/nOBqq12fB0rE8mv27h5vvH8SyIJeyto9Md23/WRsNDv/N7UZhbVnkIHZfuaD D/pgIyKeFP9ueIEBriltvd1TyX5/UfeFuCxhCJsMW7pUxdei/+zoakrvPaHPDZS5gsC7 q/8TtE0RXL8m4Qw4QEpQCwmOR+rFBF54gSuJ5VTq9VOeHKwNXycOVIMvAXU6yWxaC4R2 D+Pw== X-Gm-Message-State: AC+VfDxNR3eb6i515MRL2HLm35CyIrCkcGjZ5r7hzCK2XbSG/kHKCM5+ 0IGvQ4HUtCsj6qtAO2UWlV0IGrDKMOw= X-Received: by 2002:a05:6a00:b8a:b0:654:9d3a:f970 with SMTP id g10-20020a056a000b8a00b006549d3af970mr4634432pfj.31.1686150155142; Wed, 07 Jun 2023 08:02:35 -0700 (PDT) Received: from yogi-Zephyrus ([103.251.210.211]) by smtp.gmail.com with ESMTPSA id y24-20020aa78058000000b00634dde2992bsm2300379pfm.132.2023.06.07.08.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:02:34 -0700 (PDT) Date: Wed, 7 Jun 2023 20:32:31 +0530 From: Yogesh Hegde To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] staging: rtl8192e: Remove variable LeisurePSLeave Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768057994405860799?= X-GMAIL-MSGID: =?utf-8?q?1768057994405860799?= The variable LeisurePSLeave is set in only one place throughout the driver. This patch removes the variable and calls the real function directly instead, eliminating the unnecessary indirection. Additionally, the removal of the variable aligns with the checkpatch guidelines by removing the use of CamelCase. Signed-off-by: Yogesh Hegde --- v2: Removed the variable and called the function direction instead of just renaming the variable as suggested by Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_rx.c | 3 ++- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 6f6c31344441..231903002233 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -716,7 +716,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->check_nic_enough_desc = _rtl92e_check_nic_enough_desc; priv->rtllib->handle_assoc_response = _rtl92e_handle_assoc_response; priv->rtllib->handle_beacon = _rtl92e_handle_beacon; - priv->rtllib->LeisurePSLeave = rtl92e_leisure_ps_leave; priv->rf_set_chan = rtl92e_set_channel; priv->rtllib->start_send_beacons = rtl92e_start_beacon; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index d22a586043f2..f7fd8b77db99 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1719,7 +1719,6 @@ struct rtllib_device { void (*rtllib_ips_leave_wq)(struct net_device *dev); void (*rtllib_ips_leave)(struct net_device *dev); - void (*LeisurePSLeave)(struct net_device *dev); /* This must be the last item so that it points to the data * allocated beyond this structure by alloc_rtllib diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index d44bf261de54..d8acede4b808 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -35,6 +35,7 @@ #include "rtllib.h" #include "dot11d.h" +#include "rtl8192e/rtl_ps.h" static void rtllib_rx_mgt(struct rtllib_device *ieee, struct sk_buff *skb, struct rtllib_rx_stats *stats); @@ -1212,7 +1213,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + ieee->link_detect_info.NumTxOkInPeriod) > 8) || (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) { - ieee->LeisurePSLeave(ieee->dev); + rtl92e_leisure_ps_leave(ieee->dev); } } } diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 9fb4fee93990..07c46ad4f20e 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -16,6 +16,7 @@ #include "rtllib.h" #include "dot11d.h" #include "rtl8192e/r8192E_phy.h" +#include "rtl8192e/rtl_ps.h" /* FIXME: add A freqs */ const long rtllib_wlan_frequencies[] = { @@ -341,7 +342,7 @@ void rtllib_wx_sync_scan_wq(void *data) chan = ieee->current_network.channel; - ieee->LeisurePSLeave(ieee->dev); + rtl92e_leisure_ps_leave(ieee->dev); /* notify AP to be in PS mode */ rtllib_sta_ps_send_null_frame(ieee, 1); rtllib_sta_ps_send_null_frame(ieee, 1);