[PATCH 1/2] staging: rtl8723bs: remove unused EEPROM definitions

[PATCH 1/2] staging: rtl8723bs: remove unused EEPROM definitions

[Iñaki Sobera Sotomayor]

RTL8712_EEPROM_ID, HWSET_MAX_SIZE_128, HWSET_MAX_SIZE_256, CLOCK_RATE
and the EEPROM_*_OPCODE macros are leftovers from the original vendor
driver. None of them is referenced anywhere in the tree, so drop them.

HWSET_MAX_SIZE_512 is left in place because EEPROM_MAX_SIZE expands to
it.

No functional change intended.

Signed-off-by: Iñaki Sobera Sotomayor <inakisobera8@gmail.com>
---
 drivers/staging/rtl8723bs/include/rtw_eeprom.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_eeprom.h b/drivers/staging/rtl8723bs/include/rtw_eeprom.h
index 4294b021f1b..92eea3e2e70 100644
--- a/drivers/staging/rtl8723bs/include/rtw_eeprom.h
+++ b/drivers/staging/rtl8723bs/include/rtw_eeprom.h
@@ -8,24 +8,12 @@
 #define __RTW_EEPROM_H__
 
 
-#define	RTL8712_EEPROM_ID			0x8712
 /* define	EEPROM_MAX_SIZE			256 */
 
-#define	HWSET_MAX_SIZE_128		128
-#define	HWSET_MAX_SIZE_256		256
 #define	HWSET_MAX_SIZE_512		512
 
 #define	EEPROM_MAX_SIZE			HWSET_MAX_SIZE_512
 
-#define	CLOCK_RATE					50			/* 100us */
-
-/*  EEPROM opcodes */
-#define EEPROM_READ_OPCODE		06
-#define EEPROM_WRITE_OPCODE		05
-#define EEPROM_ERASE_OPCODE		07
-#define EEPROM_EWEN_OPCODE		19      /*  Erase/write enable */
-#define EEPROM_EWDS_OPCODE		16      /*  Erase/write disable */
-
 /* Country codes */
 #define USA							0x555320
 #define EUROPE						0x1 /* temp, should be provided later */
-- 
2.56.0

[PATCH 2/2] staging: rtl8723bs: remove unused PCI ASPM OSC definitions

[Iñaki Sobera Sotomayor]

RT_PCI_ASPM_OSC_IGNORE, RT_PCI_ASPM_OSC_ENABLE and
RT_PCI_ASPM_OSC_DISABLE describe how PCI ASPM is arbitrated between the
OS and the driver. This driver is SDIO only, it depends on MMC, and the
macros are not referenced anywhere in the tree. Drop them along with
their comment.

No functional change intended.

Signed-off-by: Iñaki Sobera Sotomayor <inakisobera8@gmail.com>
---
 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index c308fcedd63..60fbd9637b9 100644
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -84,11 +84,6 @@ enum rt_rf_power_state {
 #define	RT_CLEAR_PS_LEVEL(ppsc, _PS_FLAG)	(ppsc->cur_ps_level &= (~(_PS_FLAG)))
 #define	RT_SET_PS_LEVEL(ppsc, _PS_FLAG)		(ppsc->cur_ps_level |= _PS_FLAG)
 
-/*  ASPM OSC Control bit, added by Roger, 2013.03.29. */
-#define	RT_PCI_ASPM_OSC_IGNORE		0	 /*  PCI ASPM ignore OSC control in default */
-#define	RT_PCI_ASPM_OSC_ENABLE		BIT(0) /*  PCI ASPM controlled by OS according to ACPI Spec 5.0 */
-#define	RT_PCI_ASPM_OSC_DISABLE		BIT(1) /*  PCI ASPM controlled by driver or BIOS, i.e., force enable ASPM */
-
 enum {
 	PSBBREG_RF0 = 0,
 	PSBBREG_RF1,
-- 
2.56.0