From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96905C433F5 for ; Fri, 17 Sep 2021 08:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7803560F93 for ; Fri, 17 Sep 2021 08:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236381AbhIQIRC (ORCPT ); Fri, 17 Sep 2021 04:17:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235565AbhIQIQ6 (ORCPT ); Fri, 17 Sep 2021 04:16:58 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41BB2C0613D3 for ; Fri, 17 Sep 2021 01:06:36 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id j134-20020a1c238c000000b0030b32367649so2903366wmj.3 for ; Fri, 17 Sep 2021 01:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGibByFFKAnmoZ4Tx8w/BzTiNbMgE9jWPqkMBctkewA=; b=i3T5XrSJMNe6np1XMZiq2RLr/c0jTlnT6vhAM8Z+bY7EiVNxh8BvNdwol+blpiMn36 090gd13ZSRHY5oo7fhrl2THk73IBSSbJ3FEhKeuMKM906rHIEE3Z3sdYSL5dVVRjwRxz /xzrNFMYDG27iydVZdoVjiImkq9KATJwVhFw4dAsLpdvgGqlW+WwvxWkcREqmrlInsh8 pPZr4MjAoMpAC3o7iMXGF8Dw95Xf4RBO1I6nZfypOseQrh+2IBw6Y9EG/WFUhQDF18+J 3bBh9XNM45auFTkUpBP+6inzlVR45zt8rG+Asb8ryvRjaiSIwVlOyITc9B+h4CIJi+qf NicQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tGibByFFKAnmoZ4Tx8w/BzTiNbMgE9jWPqkMBctkewA=; b=iQoh0d4Y8ULRLopjqYhJb36v5h6bwlR1n4KmdOIeXtl/2Z4TDgKnXO4+k3kmtX4l43 xA6h73azVjhM/SKEOLx0b0lhSvZIUhNfU3LsKiRU8vFytOu7VScsxRG/7XTykgD7c4oi atjrXupsPe4FmSIfIQjJQpoOjOpLy28aRNqait6mzu7o1oQV350KiFmPdimBezEwdg3c 38pFMAA3tiDjkt7eKjeRMizVg2lY6Vr3MOBWezXE/vTJqoJnnGVfRj50ZbpM63hh/2Do jKyQPl8Ao0SJ/vioCZ/ql5Xs8x/eidIs7YRX4yT5oDvxXRA75+jcWlUt8b5E/OWhqzZv 5gSQ== X-Gm-Message-State: AOAM530yJxSqlPUCOl1BtaL155TpaVgspDTGEA2wvHjuNEahBokACI5X 19bz6N/m6y3PR1E5Zl0xzhM= X-Google-Smtp-Source: ABdhPJztQgGs+x+7ykrjLjj53lqpu0wmLpU32mXyoCsVHFdtxUtIrxEkhB6A/qEkVmb7k0zgPrqpRw== X-Received: by 2002:a05:600c:b41:: with SMTP id k1mr14093514wmr.4.1631865994877; Fri, 17 Sep 2021 01:06:34 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::ae40]) by smtp.gmail.com with ESMTPSA id r129sm5690890wmr.7.2021.09.17.01.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 01:06:34 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/4] staging: r8188eu: remove switches from phy_RF6052_Config_ParaFile() Date: Fri, 17 Sep 2021 10:06:15 +0200 Message-Id: <20210917080615.25819-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210917080615.25819-1-straube.linux@gmail.com> References: <20210917080615.25819-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In function phy_RF6052_Config_ParaFile() the variable eRFPath is always 0 and RF_PATH_A = 0 in this driver. So we can remove the 'switch (eRFPath)' statements and just keep the code from the RF_PATH_A cases. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 39 +++---------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c index 63e85052cc98..2f16c0966973 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -466,16 +466,8 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) pPhyReg = &pHalData->PHYRegDef[eRFPath]; /*----Store original RFENV control type----*/ - switch (eRFPath) { - case RF_PATH_A: - case RF_PATH_C: - u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV); - break; - case RF_PATH_B: - case RF_PATH_D: - u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16); - break; - } + u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV); + /*----Set RF_ENV enable----*/ PHY_SetBBReg(Adapter, pPhyReg->rfintfe, bRFSI_RFENV << 16, 0x1); udelay(1);/* PlatformStallExecution(1); */ @@ -492,31 +484,12 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) udelay(1);/* PlatformStallExecution(1); */ /*----Initialize RF fom connfiguration file----*/ - switch (eRFPath) { - case RF_PATH_A: - if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath)) - rtStatus = _FAIL; - break; - case RF_PATH_B: if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath)) - rtStatus = _FAIL; - break; - case RF_PATH_C: - break; - case RF_PATH_D: - break; - } + rtStatus = _FAIL; + /*----Restore RFENV control type----*/; - switch (eRFPath) { - case RF_PATH_A: - case RF_PATH_C: - PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); - break; - case RF_PATH_B: - case RF_PATH_D: - PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16, u4RegValue); - break; - } + PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); + if (rtStatus != _SUCCESS) goto phy_RF6052_Config_ParaFile_Fail; -- 2.33.0