From patchwork Mon Jan 23 20:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 47397 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1811823wrn; Mon, 23 Jan 2023 12:58:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXsDlOeoOdf8ghyKZaHgPwtRlgVJeXNxkQx7ZxIAG5zYmimZCA9icgcW8Yn9PAgVNIDizoAw X-Received: by 2002:a17:902:c10d:b0:194:4986:a3db with SMTP id 13-20020a170902c10d00b001944986a3dbmr27526159pli.36.1674507529191; Mon, 23 Jan 2023 12:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674507529; cv=none; d=google.com; s=arc-20160816; b=onD4MywJ2fO4s88E7M0ftav82AGn6DvB4JWIfANqaZca+UthZ+TqykOehs4XmV7rQy 0F/yMUyNP+pjfraGaIVN3gGDv2Fzxkmd86I+GpK4faXJHR+5+3HqirM1iicA/I97SClZ CFyBn2SKe3MZt2SUK8Zb0Do1wEADrwGVjw6nP4Cmn+AxFSdQjBUktAxwHFGiNDlLV7aA stRc1Lsi2sv2XFRBD/scVazqaFmwXWqHjT9qW+lpNiM+ORsi0PAGBorhFzmZPtGxeXi4 k9SS0xObyl3OoEyIZHaDjt7Lj4OQUkAAzIslniAxWrek0IRH/gAhSm0HDnffu2lC3Yjs ZmaQ== 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=2jgZ6pkYBeD1DIdt8l5Ns3z4OkE8tlHpVe/Zwxn1sUM=; b=oJutekIxD/AXKDZQJ6sz4PQT5i0KutDXn0JbP+s8m10C1GrHWJq3nqgSqCxilJluPm cPdkZ5gS7TVxRTWwO+DbTPbL3AcvdQARcNC8rKsfM3EpcxOjnQ8reC+UT/Y9NHmslK7M 03GYwKn5jkcz6fJtIS9jhq/vn0CU4IfzDExx1e+8EtzHhL690zaCdeq7AaflD4kuxBjH aqBksfJhbBu6Ssc5DfKedUedQBZPWtDTeX8rxLR+4hc4PqV5ujK4qcKstQqvQKgCew6+ XQeh4GggcR/eyNuv+u3qvplS5AAPLKznH0jaR18ity9lhqrgsRnzPP5kUIW38f5VvLP6 nk3w== 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 k16-20020a170902c41000b0017f75654a51si439966plk.245.2023.01.23.12.58.36; Mon, 23 Jan 2023 12:58:49 -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 S232314AbjAWU6B (ORCPT + 99 others); Mon, 23 Jan 2023 15:58:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232322AbjAWU5y (ORCPT ); Mon, 23 Jan 2023 15:57:54 -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 57D0538B4A for ; Mon, 23 Jan 2023 12:57:36 -0800 (PST) Received: from ipservice-092-217-089-134.092.217.pools.vodafone-ip.de ([92.217.89.134] 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 1pK3pS-0000Lk-Rp; Mon, 23 Jan 2023 21:54:10 +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 20/23] staging: r8188eu: remove rtw_xmitframe_enqueue Date: Mon, 23 Jan 2023 21:53:39 +0100 Message-Id: <20230123205342.229589-21-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123205342.229589-1-martin@kaiser.cx> References: <20230123205342.229589-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?1755848406421239396?= X-GMAIL-MSGID: =?utf-8?q?1755848406421239396?= The rtw_xmitframe_enqueue function is only one line. We can remove it and call rtw_xmit_classifier directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 5 ----- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/include/rtw_xmit.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 4f9defdbe257..3752d4fddd11 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1345,11 +1345,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram spin_unlock_bh(&pframequeue->lock); } -s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) -{ - return rtw_xmit_classifier(padapter, pxmitframe); -} - struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i) { struct hw_xmit *phwxmit; diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c index e067cc271686..18557738dbad 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -596,7 +596,7 @@ static s32 pre_xmitframe(struct adapter *adapt, struct xmit_frame *pxmitframe) return true; enqueue: - res = rtw_xmitframe_enqueue(adapt, pxmitframe); + res = rtw_xmit_classifier(adapt, pxmitframe); spin_unlock_bh(&pxmitpriv->lock); if (res != _SUCCESS) { diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index 30f8000120b2..4aa7833487c8 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -320,8 +320,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue); struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, int up, u8 *ac); -s32 rtw_xmitframe_enqueue(struct adapter *padapter, - struct xmit_frame *pxmitframe); struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i);