From patchwork Tue Feb 7 19:23:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 54048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3035026wrn; Tue, 7 Feb 2023 11:28:33 -0800 (PST) X-Google-Smtp-Source: AK7set8falzwaYq352+aGSVQI0w4eY5YwUQvn0tiHYAkTVVuqFFLbujR5BBLF6zut/rl0J1Woqia X-Received: by 2002:a17:906:7c93:b0:888:c0b4:7f08 with SMTP id w19-20020a1709067c9300b00888c0b47f08mr4537061ejo.29.1675798113674; Tue, 07 Feb 2023 11:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675798113; cv=none; d=google.com; s=arc-20160816; b=NJRs97H7DRqruK1j9pGZTrJ/zxzJQ38rfniskRzWOPmfECWik0RAuSlPCJBpO7K/6Q jrUn2Uhd0jnIgi30VccGAro9pjXeiMTBSRYAO2+iyFJFBTyn7EReUoQroT0I04Edc3In Cx7Yt+d/vNfFtuc7svk8ovFp79jQUdX8e3AGGGjsMSjnjRRlnvGXAOznJPt7WYBHTbsF vbSZSUL+bHRp4tM25Od1fM4wON+vbM9w439dL+typzAlXhX/Nf9n/wuyXZp7Mi2yftqw pnNk/cNsFA6cfHHyTfJQjFw7eKKsCet3/TvexEdQXk6zSoqkDzmOYt0ZeloHVRaRmHGN nFuA== 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=3GUdt95KWPtYt/meqt9Ou5tAEnx9clL7a178ynP2VYA=; b=Z08g6cPkWEnbXtyv4Ozkq7igBee4/sMwCize9c2hsSfj4b4nMzctYuY2eJQ6sPzzUC 5eYYiSFcT4AerxoEksvVgUINZlJ4xJsNzbu5ibzG9X23dLNJ2kFRXs6qUmkKUqAMOW7C t8P57EmTBj2Q4TnLE4Uhbob7/ji47xaHc/0l5Q4qi574pVRk4dNL9Qi8rPE7XlU6ectm dV9nQ+UZP6+wcfIwx4mQlPxLjrI/yDUvw0QpqcqTGR1EYM4qTAU+Yx36+hBK3KCd9n/O Z1znGdWAXpLGqHvTZ2bdGzdUpMnoATMiescIEzHwaks5ADWExiqfxNGQDFIGvxmCLnfe D3fg== 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 x14-20020aa7d38e000000b004aab2282fafsi8738235edq.565.2023.02.07.11.28.10; Tue, 07 Feb 2023 11:28:33 -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 S231717AbjBGTXh (ORCPT + 99 others); Tue, 7 Feb 2023 14:23:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbjBGTXe (ORCPT ); Tue, 7 Feb 2023 14:23:34 -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 0E03722DC7 for ; Tue, 7 Feb 2023 11:23:34 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTYt-0002XK-3T; Tue, 07 Feb 2023 20:23:27 +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 1/7] staging: r8188eu: merge do_queue_select into its only caller Date: Tue, 7 Feb 2023 20:23:13 +0100 Message-Id: <20230207192319.294203-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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?1757201682851701774?= X-GMAIL-MSGID: =?utf-8?q?1757201682851701774?= Merge do_queue_select into its only caller. It's only a simple assignment. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index 18941320e70e..4d6210d89533 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1609,15 +1609,6 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) return addr; } -static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib) -{ - u8 qsel; - - qsel = pattrib->priority; - - pattrib->qsel = qsel; -} - /* * The main transmit(tx) entry * @@ -1656,7 +1647,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt) rtw_led_control(padapter, LED_CTL_TX); - do_queue_select(padapter, &pxmitframe->attrib); + pxmitframe->attrib.qsel = pxmitframe->attrib.priority; spin_lock_bh(&pxmitpriv->lock); if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe)) {