From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A9352C80 for ; Sun, 28 Nov 2021 17:09:52 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id a9so31385660wrr.8 for ; Sun, 28 Nov 2021 09:09:51 -0800 (PST) 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=RsFXfqAANuiI/h15io5hKx8qixy3sChbPkqfSorjFfM=; b=nS+ed+GE7CAqS29r3HgW/k9ZhQ/YL02pqe5nMkLQ4O420rIFqt5asIY2BepoGrc/Jc 6ww0mWDmyW4c4JiCuPJiP66rlJZlMmkjKMJjgH/OldlkW5MnXwz5JdqKK2ji8euW+J8m 0DYS4G31vQCJiACeDlFp54zEzCKRwzag6IrgauaAwq78dMUXgHa1+EGORh3/DjBnKJVo H6nlT5RwjQqeT3ZdEFQzWCjdMOyz7Oe/CCKa2zr5CCrbHnDqPxyuXbWrfxJJpUHrsPfQ xg54tbENOZ0eaxofr4fCJNy8efGpx/V1SDJJnDjkcC1HZ2rAbRQOWXt+Rapwr0i7n3ex si+w== 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=RsFXfqAANuiI/h15io5hKx8qixy3sChbPkqfSorjFfM=; b=kGzI6LAlMFzHmWjf1HLcQBWPGepIso0LukTUH/ii12461v+wnLNNOY/l36XQ1Ngr6O uaXpd56GyuhfGdB7/RZlsrCOpLlrOe6sW9PNgAW21Bs0HcCZCISrHOWGJH+c3IVVfWwJ kH4Gxq4OUrwtROzddzmtF4jnCE2HqG+syNBhT11xp7qUY4t3XH1ICYEI14ByaF4IETC5 ZXoyQHDBsHLl3mVbtYRzadWVzHdg0amhlNeNGZ1zYb/beRoe5Q5CHkLH9qagzuVAx/E9 Tuxq7vfbGszMZIDkO7qXtmYvOax8k7OOm85pJUdOmm+LkwkwLo3ck5Bs7Coec7rCf1Ii 92Dw== X-Gm-Message-State: AOAM530e4Izqe/NV0LWC9Bvc72HQdOV2GOv6Ef7zSE9ycqIObkMsTPGx C3bHNjIkaOJV75MyIiC4e1A= X-Google-Smtp-Source: ABdhPJxBwVT+V6r+ikDnYsUk7RgCvk8AbO9P6TfrZSvM7oYI5fkVBNXa24tXMWW2B9L09DXMtUQrcA== X-Received: by 2002:a05:6000:cd:: with SMTP id q13mr28114184wrx.488.1638119390527; Sun, 28 Nov 2021 09:09:50 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::ac86]) by smtp.gmail.com with ESMTPSA id n15sm18243845wmq.38.2021.11.28.09.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Nov 2021 09:09:50 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 03/10] staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset() Date: Sun, 28 Nov 2021 18:09:17 +0100 Message-Id: <20211128170924.5874-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128170924.5874-1-straube.linux@gmail.com> References: <20211128170924.5874-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit pHalData->rf_type is always RF_1T1R. Remove unnecessary checks and related dead code from storePwrIndexDiffRateOffset(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c index 47402851700b..258349e6104f 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -506,8 +506,7 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4] = Data; if (RegAddr == rTxAGC_A_Mcs15_Mcs12) { pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5] = Data; - if (pHalData->rf_type == RF_1T1R) - pHalData->pwrGroupCnt++; + pHalData->pwrGroupCnt++; } if (RegAddr == rTxAGC_B_Rate18_06) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8] = Data; @@ -523,11 +522,8 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11] = Data; if (RegAddr == rTxAGC_B_Mcs11_Mcs08) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12] = Data; - if (RegAddr == rTxAGC_B_Mcs15_Mcs12) { + if (RegAddr == rTxAGC_B_Mcs15_Mcs12) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13] = Data; - if (pHalData->rf_type != RF_1T1R) - pHalData->pwrGroupCnt++; - } } static int phy_BB8188E_Config_ParaFile(struct adapter *Adapter) -- 2.34.0