Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp3128965rwb; Sat, 6 Aug 2022 13:25:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR5tw3ESuOI1ucNgpOXD/TEd/zKqTxSFrRa6IVyCFQtx95Kv/0/GQn/dM3Z7rKdSt/eXUFu9 X-Received: by 2002:a65:6043:0:b0:41d:978:7a47 with SMTP id a3-20020a656043000000b0041d09787a47mr6536807pgp.484.1659817558180; Sat, 06 Aug 2022 13:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659817558; cv=none; d=google.com; s=arc-20160816; b=jCXNPfd5O17xL8hN7fiBxSuiYIbeM7Qtq2iR1EH8+B2QDNmX8D9Vp/Lt3xYrjGM0Ct 8Vl+uw7XREQiJlJ8vrlirlbva75QaJ38bGRWGz6BI9B9UKYKX+E988jU2eY1SNFYLHz+ 3kBKdXv/ibvA6iLMfynu4XKZBwnxjXEfI5mu99JD+8jiS4G6pgfOnkqEmTFJiL4F1/6P oQPskLK6pcbLaNMe7agGdFU+V19siBz+NiSCYz3IPp/Vxh8FO6wxwVBpO/b/O6DsWaOz wSvy396EYNg6vDxEMg5HH0O8wCxALzXT2FLQxzmzU5rZS0qlm4cgzjhxsLtXefyxJADf eZ/g== 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=CfzZz2i7LwZ/bHh0oAJM/dm4D2ZzvEOyiM07E14pmxM=; b=Ux+xqrp7Oei/aLAsXzsuV0zMjAK3LpBjXZOmQ7o8kUakITluALXY5jnN6aYuXLXFcy DEWEzCAGFYkv6awpe+Dj68msuU9oB8Ltra4/KSJGGLGk2FK6MyD6ioQYJjlFkygx5Tg+ DycTGBtGO7GGNZuE6O59QONcVrrIncUkRzR5brj6H0jxQ8UBEk13KNpZVCqzhjIXYt8l lwhRJ7xOdWFun4yUrFsrxTKSQGESt8m6X38IiQrCn3D7RZazciw314dBiT8/rRHGAqHz 8T1v9OHGEdtxx1ax4KZxugziapdsBNr7ox11W1TpyM8GsJLFZGbBc7EZ2Aon1K9t44Aw LUoA== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i11-20020a63584b000000b0040d3e6f0ee2si5872292pgm.656.2022.08.06.13.25.44; Sat, 06 Aug 2022 13:25:57 -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; 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 S234004AbiHFT4j (ORCPT + 99 others); Sat, 6 Aug 2022 15:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233366AbiHFT4I (ORCPT ); Sat, 6 Aug 2022 15:56:08 -0400 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 A8FBFCE39 for ; Sat, 6 Aug 2022 12:56:05 -0700 (PDT) Received: from dslb-188-097-043-167.188.097.pools.vodafone-ip.de ([188.97.43.167] 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 1oKPtt-0004Tu-Ai; Sat, 06 Aug 2022 21:55:57 +0200 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 09/13] staging: r8188eu: simplify three_out_pipe Date: Sat, 6 Aug 2022 21:55:36 +0200 Message-Id: <20220806195540.777390-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220806195540.777390-1-martin@kaiser.cx> References: <20220806195540.777390-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE 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 Only one of the mappings in three_out_pipe depends on the wifi_cfg flag. Simplify the code accordingly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 431661be95e0..044e608bf6e2 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -48,17 +48,12 @@ static void three_out_pipe(struct adapter *adapter, bool wifi_cfg) /* 0:H, 1:N, 2:L */ - if (wifi_cfg) { - pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */ - pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];/* VI */ - pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];/* BE */ - pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[1];/* BK */ - } else { - pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */ - pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];/* VI */ - pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];/* BE */ - pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[2];/* BK */ - } + pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */ + pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[1];/* VI */ + pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[2];/* BE */ + + pdvobjpriv->Queue2Pipe[3] = wifi_cfg ? + pdvobjpriv->RtOutPipe[1] : pdvobjpriv->RtOutPipe[2];/* BK */ } int rtl8188eu_interface_configure(struct adapter *adapt) -- 2.30.2