From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 739CC72 for ; Fri, 3 Sep 2021 09:34:16 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id v10so7297878wrd.4 for ; Fri, 03 Sep 2021 02:34:16 -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=u8mntTNaiLWjY70DY1DSoMIjwedthxyJ8a+lz8Q75Aw=; b=E93pGRgevUTJ8BopWVKHQLqfluJChQEDqKtWpgvCdSBKAXUkvAAJ1pDWt3FrivsUAl lz0XI7CJfMlzkiv7c6XAe7g/EiP6yXCbhB9nyxTrOxX3oXwMzqo96SwL7w1j/LhLHAkn JNFyyRMwxs6OBhwzauhm4t4LFohLPR7+l2J41YUxFmYjHjpDRGj/bu3ilbOHaqOZiLTA w4qrWlNZC/ThiiWXwetQUw1pl+S7fDWrU9mfmpHLLHBUWCQklZ6kXcp63W8n65ahCy9W L2zldXhX1Ce9DExZ5zolazRl/jR9r+BUqouxUfR0oC68qPc7DvRHbUU9QRz5inDjSy/Y nkSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u8mntTNaiLWjY70DY1DSoMIjwedthxyJ8a+lz8Q75Aw=; b=L6193y4AR0l6EW2NpXBu1PlxsFpwGBkSDjj4Kwh4CAWTjT1d+QsGrY1cPuAxSV+AsQ LfMEHax/ezekPNiMZe69QQXjyzXFjTOGzKmckSy42GeY9i/THldkcBGV5VK2cQgHE2V4 3804LO4Fybtp4c1maeOfmp3sBK0hAFr1FTdYhQ8BCHp+W2R+Pg8b+0M6oHPS7qZGhQRf s/rlg1NyiSCWyfaPycrPkmQ2z7jUUEGeNEJGJpnoBTE14a8bRHKsOPLXX29193KeLvj3 tb31Zd9qcPQIj1n+zrmQr3WD23HVHZ3Rrny4xLCLb5nD2MGsiWuQb73uiziVEGo+lDz2 9fiw== X-Gm-Message-State: AOAM531C4WqgOeDccgPOO9bRkkEBjm6txcIIk4rWds0GWsHwvFDio+N1 83fCsbgBGhAm12FQytNBcbpCLBbn+/vlEQ== X-Google-Smtp-Source: ABdhPJwJSBYG573SRljTTzhmSBZXyru+7CMW3qF19k6lQr642pBHX+l5XraG2LZPpZNvi1zyl8lXUg== X-Received: by 2002:adf:b7cd:: with SMTP id t13mr3008755wre.63.1630661654939; Fri, 03 Sep 2021 02:34:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::16fa]) by smtp.gmail.com with ESMTPSA id x11sm3853060wmk.21.2021.09.03.02.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 02:34:14 -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 5/6] staging: r8188eu: remove IS_HARDWARE_TYPE_8188* macros Date: Fri, 3 Sep 2021 11:33:53 +0200 Message-Id: <20210903093354.12645-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210903093354.12645-1-straube.linux@gmail.com> References: <20210903093354.12645-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 The IS_HARDWARE_TYPE_8188* macros are not needed because the driver is for RTL8188EU chips, remove them. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 20 +++++++++----------- drivers/staging/r8188eu/include/hal_intf.h | 11 ----------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_mp.c b/drivers/staging/r8188eu/hal/rtl8188e_mp.c index ee0c96890cf3..eb9e32dfcbe7 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_mp.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_mp.c @@ -506,12 +506,11 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) if (bStart) { /* Start Single Tone. */ /* <20120326, Kordan> To amplify the power of tone for Xtal calibration. (asked by Edlu) */ - if (IS_HARDWARE_TYPE_8188E(pAdapter)) { - reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask); - reg58 &= 0xFFFFFFF0; - reg58 += 2; - PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58); - } + reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask); + reg58 &= 0xFFFFFFF0; + reg58 += 2; + PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58); + PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x0); PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x0); @@ -528,11 +527,10 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) /* Stop Single Tone. */ /* <20120326, Kordan> To amplify the power of tone for Xtal calibration. (asked by Edlu) */ /* <20120326, Kordan> Only in single tone mode. (asked by Edlu) */ - if (IS_HARDWARE_TYPE_8188E(pAdapter)) { - reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask); - reg58 &= 0xFFFFFFF0; - PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58); - } + reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask); + reg58 &= 0xFFFFFFF0; + PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58); + write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x1); write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index bbdbbf9697b1..117a98e5444e 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -283,17 +283,6 @@ enum hardware_type { HARDWARE_TYPE_MAX, }; -/* RTL8188E Series */ -#define IS_HARDWARE_TYPE_8188EE(_Adapter) \ -(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188EE) -#define IS_HARDWARE_TYPE_8188EU(_Adapter) \ -(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188EU) -#define IS_HARDWARE_TYPE_8188ES(_Adapter) \ -(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188ES) -#define IS_HARDWARE_TYPE_8188E(_Adapter) \ -(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || \ - IS_HARDWARE_TYPE_8188ES(_Adapter)) - #define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv) #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse) -- 2.33.0