Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp3119134rwb; Sat, 6 Aug 2022 13:10:47 -0700 (PDT) X-Google-Smtp-Source: AA6agR6VhJCgJKESowbiuj9RoPanqaxtJrZPMhcODOuYRVEMLJlRrqtNMx5Gg5OgfiOEGT7YJQOo X-Received: by 2002:a17:90b:3e88:b0:1f5:6029:1bf7 with SMTP id rj8-20020a17090b3e8800b001f560291bf7mr16187839pjb.155.1659816647554; Sat, 06 Aug 2022 13:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659816647; cv=none; d=google.com; s=arc-20160816; b=H+/nz1OvE0XREx2KWjw1D8TQSUPR+PKVBJaflrlD9iEYFyT1FFBJ0nBxoepOYfRHvu Iw5H+VtTrZaWpzo2wqPtoH9eMKt9ePkwhsYFe0saGNQ4WZw/lZpjV3BEaGO1r1YCkLsr 0fkMKULZm3mKPisbZPQiO/T7srBxDy9LR65Envqm5ZC58g4TvJptOxLT+wyTvc+QHLax UfGpzdazYlmQv+IsOkWcUu+nTL3qIkRaiWP5sOXQLbVN7FPOrREX/LkCQhq5MTv+IEIz bT6oeZDIW9PBK/iu/mSaTDYMJaj1L4173DKH9AED5YjD9e8yWJlI3TKbR54DllpywILG de5w== 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=b9t87HVkT7Cu33lhrjsc9Dis6GTp5nJDK4LuD7D8Ijg=; b=QHv3gFllLCfOY4EzwupDRKZde6yXgJm5354epqRQNWVq3I31HMpHZRpJf/jscgWY4q 92IzQ0tBcdgtSU9N9MvlesDvkX/QhHdQmOmnxLIPcLicXHvX/m/V6HENqiv7ox+z+eTV bQAuqQP8HXQUTQz4kM1x/BDdaJaes1PtHmmJDrlduSVCzNpk//KI3ebgaZbo3yDssO4Q PeHrUgC4+blnK1eO7NvYVeBMxH+eKEaKChy7iWo6g93/xToTHSltS1CW3ULVpnr35Hrq KIEh/TWfS8HKESArRt35Fc8NwxipVZg9jKbMh+Fb8ExhrkrYE5XAadujONuSOraSJlFS BPPQ== 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 q2-20020a634302000000b0041cefbcc1d3si1920032pga.157.2022.08.06.13.10.31; Sat, 06 Aug 2022 13:10:47 -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 S233735AbiHFT4g (ORCPT + 99 others); Sat, 6 Aug 2022 15:56:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233200AbiHFT4G (ORCPT ); Sat, 6 Aug 2022 15:56:06 -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 6625CBC3C for ; Sat, 6 Aug 2022 12:56:03 -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 1oKPtu-0004Tu-53; Sat, 06 Aug 2022 21:55:58 +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 10/13] staging: r8188eu: simplify two_out_pipe Date: Sat, 6 Aug 2022 21:55:37 +0200 Message-Id: <20220806195540.777390-11-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 Simplify the two_out_pipe function. Move common settings out of the if clause. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_halinit.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 044e608bf6e2..f3314bed9285 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -29,15 +29,14 @@ static void two_out_pipe(struct adapter *adapter, bool wifi_cfg) /* 0:H, 1:L */ + pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[0];/* VI */ + pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[1];/* BE */ + if (wifi_cfg) { pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[1];/* VO */ - pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[0];/* VI */ - pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[1];/* BE */ pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[0];/* BK */ } else { pdvobjpriv->Queue2Pipe[0] = pdvobjpriv->RtOutPipe[0];/* VO */ - pdvobjpriv->Queue2Pipe[1] = pdvobjpriv->RtOutPipe[0];/* VI */ - pdvobjpriv->Queue2Pipe[2] = pdvobjpriv->RtOutPipe[1];/* BE */ pdvobjpriv->Queue2Pipe[3] = pdvobjpriv->RtOutPipe[1];/* BK */ } } -- 2.30.2