From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: gregkh@linuxfoundation.org
Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] staging: rtl8723bs: remove HAL_{BB,MAC,RF,FW}_ENABLE macros
Date: Tue, 15 Jun 2021 13:45:35 +0200 [thread overview]
Message-ID: <04248acbd22f9be30d21891926e134490b34036a.1623756906.git.fabioaiuto83@gmail.com> (raw)
In-Reply-To: <cover.1623756906.git.fabioaiuto83@gmail.com>
remove HAL_{BB,MAC,RF,FW}_ENABLE macros.
They are used to turn on/off by hand some core
capabilities we want to be always 'on'.
So remove usages and definitions.
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ------
drivers/staging/rtl8723bs/include/autoconf.h | 4 ----
drivers/staging/rtl8723bs/include/hal_phy.h | 8 --------
3 files changed, 18 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 38acde4be94d..3738727feb60 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -683,29 +683,23 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
/* <Roger_Notes> Current Channel will be updated again later. */
pHalData->CurrentChannel = 6;
-#if (HAL_MAC_ENABLE == 1)
ret = PHY_MACConfig8723B(padapter);
if (ret != _SUCCESS)
return ret;
-#endif
/* */
/* d. Initialize BB related configurations. */
/* */
-#if (HAL_BB_ENABLE == 1)
ret = PHY_BBConfig8723B(padapter);
if (ret != _SUCCESS)
return ret;
-#endif
/* If RF is on, we need to init RF. Otherwise, skip the procedure. */
/* We need to follow SU method to change the RF cfg.txt. Default disable RF TX/RX mode. */
/* if (pHalData->eRFPowerState == eRfOn) */
{
-#if (HAL_RF_ENABLE == 1)
ret = PHY_RFConfig8723B(padapter);
if (ret != _SUCCESS)
return ret;
-#endif
}
/* */
diff --git a/drivers/staging/rtl8723bs/include/autoconf.h b/drivers/staging/rtl8723bs/include/autoconf.h
index d1a97fea8065..8587b746c720 100644
--- a/drivers/staging/rtl8723bs/include/autoconf.h
+++ b/drivers/staging/rtl8723bs/include/autoconf.h
@@ -12,7 +12,3 @@
* Auto Config Section
*/
#define LPS_RPWM_WAIT_MS 300
-
-#define HAL_MAC_ENABLE 1
-#define HAL_BB_ENABLE 1
-#define HAL_RF_ENABLE 1
diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
index e9944ffed100..19221289b8ce 100644
--- a/drivers/staging/rtl8723bs/include/hal_phy.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy.h
@@ -6,14 +6,6 @@
******************************************************************************/
#ifndef __HAL_PHY_H__
#define __HAL_PHY_H__
-
-
-/* FPGA_PHY and ASIC */
-#define HAL_FW_ENABLE 1
-#define HAL_MAC_ENABLE 1
-#define HAL_BB_ENABLE 1
-#define HAL_RF_ENABLE 1
-
/* */
/* Antenna detection method, i.e., using single tone detection or RSSI reported from each antenna detected. */
/* Added by Roger, 2013.05.22. */
--
2.20.1
next prev parent reply other threads:[~2021-06-15 11:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 11:45 [PATCH 0/8] staging: rtl8723bs: remove unneeded files from tree Fabio Aiuto
2021-06-15 11:45 ` [PATCH 1/8] staging: rtl8723bs: remove unused debug macro Fabio Aiuto
2021-06-15 11:45 ` [PATCH 2/8] staging: rtl8723bs: remove unneeded comments Fabio Aiuto
2021-06-15 11:45 ` [PATCH 3/8] staging: rtl8723bs: remove unused WAKEUP_GPIO_IDX macro definition Fabio Aiuto
2021-06-15 11:45 ` [PATCH 4/8] staging: rtl8723bs: remove unneeded DISABLE_BB_RF macro Fabio Aiuto
2021-06-15 11:45 ` Fabio Aiuto [this message]
2021-06-15 11:45 ` [PATCH 6/8] staging: rtl8723bs: move LPS_RPWM_WAIT_MS macro Fabio Aiuto
2021-06-15 13:23 ` Greg KH
2021-06-15 11:45 ` [PATCH 7/8] staging: rtl8723bs: remove include/autoconf.h header file from tree Fabio Aiuto
2021-06-15 13:24 ` Greg KH
2021-06-15 14:14 ` Fabio Aiuto
2021-06-15 11:45 ` [PATCH 8/8] staging: rtl8723bs: remove two unused files " Fabio Aiuto
2021-06-15 12:11 ` [PATCH 0/8] staging: rtl8723bs: remove unneeded " Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04248acbd22f9be30d21891926e134490b34036a.1623756906.git.fabioaiuto83@gmail.com \
--to=fabioaiuto83@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).