From patchwork Fri Dec 30 18:06:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 37733 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3008379wrt; Fri, 30 Dec 2022 10:08:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXseeiAE6AORW8jeXry3N7UzRyhTP/LydE8fUcbhagjUDWWqRKO4iY4107J7FZIap47aljQS X-Received: by 2002:a17:902:ea02:b0:191:271f:477c with SMTP id s2-20020a170902ea0200b00191271f477cmr36366344plg.32.1672423693163; Fri, 30 Dec 2022 10:08:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672423693; cv=none; d=google.com; s=arc-20160816; b=ibPsbYjUmb4VFNQGNgdMpTyMiRzHgE+vCELbRsRTreVjecV2+wewV2ZLXNL7tpwo5C vvRbmL2R/Zq0cRsdIRu7rQaKp6jDJeC9Yz+YzkERcWNJUlSe1SIO6Wm6LVMfxytTdqFB 9zATQGBoxf3AhntSuj9VjTnfuTHexFmbTty2gfWjBTacMgtTXEpns305fWej6/fMneTr zhkrxpltWkMQJJhmadERdADQLkyamHH/94WpIKs0q/xIlLwqfuMASHl9Ev9vmy1JVIO1 5qV4GW4WsYNzkmasmIA5sEPrvsO/nn5R6pNHljWPqKwlNQLly9uooDJVqT7+ejk+nORY v6+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2R7kegvqFcvrMC6siRVf7ShUBth0cs5a6HZ1GbRh4NE=; b=wNHJigF4acipQCraPyEixYiI23dM+n7b2mTD0BHi0g/+Eju9aLwGXUUdH0pxDexYME KYbSiJtj1YuUOOQo6AELkI8hCilN9V9JEME1SD6Z+PZEwSvrjbUIWda3KYoAbAhHJag9 El+uEqfUIaWASDCT2Uvv1+Jakkine2mACNwsgaIGvYx7iTFW4SBKyjw9czNxukV85hDl yk/2ihQgwuKztBK/jGRQ021h9OnVTWiMDuAoBe0367iJQ+pMbj0Hy4zk3quNLpXSFWMn 8v9OrvQ3J5ZyF5D39GdcEInt6yvJ2nrvXJ7cPs5KEGCqyI92leC7lssv/UvPjDKh/n3U h5yQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a17090332c900b00186b1459953si23807161plr.382.2022.12.30.10.08.01; Fri, 30 Dec 2022 10:08:13 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235266AbiL3SHc (ORCPT + 99 others); Fri, 30 Dec 2022 13:07:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235435AbiL3SHU (ORCPT ); Fri, 30 Dec 2022 13:07:20 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D6FB1C429 for ; Fri, 30 Dec 2022 10:07:17 -0800 (PST) Received: from dslb-188-097-208-179.188.097.pools.vodafone-ip.de ([188.97.208.179] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pBJmh-0004rR-H7; Fri, 30 Dec 2022 19:07:11 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 07/20] staging: r8188eu: remove rtl8188eu_init_xmit_priv Date: Fri, 30 Dec 2022 19:06:33 +0100 Message-Id: <20221230180646.91008-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221230180646.91008-1-martin@kaiser.cx> References: <20221230180646.91008-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham 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?1753663346103097197?= X-GMAIL-MSGID: =?utf-8?q?1753663346103097197?= rtl8188eu_init_xmit_priv's only jobs is to initialise the xmit tasklet. Remove rtl8188eu_init_xmit_priv and initialise the xmit tasklet in _rtw_init_xmit_priv. Yet again, this makes the code a tiny bit smaller. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 10 ---------- drivers/staging/r8188eu/include/rtl8188e_xmit.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 35d291d78c60..62b66a205a06 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -211,7 +211,7 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) mutex_init(&pxmitpriv->ack_tx_mutex); rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0); - rtl8188eu_init_xmit_priv(padapter); + tasklet_init(&pxmitpriv->xmit_tasklet, rtl8188eu_xmit_tasklet, (unsigned long)padapter); return 0; diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c index cca74cf28915..cf9779b86b9c 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -9,16 +9,6 @@ #include "../include/usb_ops.h" #include "../include/rtl8188e_hal.h" -s32 rtl8188eu_init_xmit_priv(struct adapter *adapt) -{ - struct xmit_priv *pxmitpriv = &adapt->xmitpriv; - - tasklet_init(&pxmitpriv->xmit_tasklet, - rtl8188eu_xmit_tasklet, - (unsigned long)adapt); - return _SUCCESS; -} - static void rtl8188eu_cal_txdesc_chksum(struct tx_desc *ptxdesc) { u16 *usptr = (u16 *)ptxdesc; diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h index 865468d6b922..82439f52b0c8 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h @@ -131,7 +131,6 @@ struct txrpt_ccx_88e { void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull); -s32 rtl8188eu_init_xmit_priv(struct adapter *padapter); s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame); s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *frame); s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);