* [PATCH 1/4] staging: r8188eu: EepromAddressSize is set but not used
2022-02-25 12:08 [PATCH 0/4] staging: r8188eu: some simple cleanups Michael Straube
@ 2022-02-25 12:08 ` Michael Straube
2022-02-25 12:08 ` [PATCH 2/4] staging: r8188eu: remove unused function prototype Michael Straube
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2022-02-25 12:08 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
EepromAddressSize in struct adapter is set but not used. Remove it and
remove the now unused function GetEEPROMSize8188E().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 15 ---------------
drivers/staging/r8188eu/hal/usb_halinit.c | 3 ---
drivers/staging/r8188eu/include/drv_types.h | 1 -
drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
4 files changed, 20 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index cf58dfc3ff4d..fc47f1b596cc 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -535,21 +535,6 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) & ~BIT(1));
}
-u8 GetEEPROMSize8188E(struct adapter *padapter)
-{
- u8 size = 0;
- u32 cr;
-
- cr = rtw_read16(padapter, REG_9346CR);
- /* 6: EEPROM used is 93C46, 4: boot from E-Fuse. */
- size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
-
- netdev_dbg(padapter->pnetdev, "EEPROM type is %s\n",
- size == 4 ? "E-FUSE" : "93C46");
-
- return size;
-}
-
/* */
/* */
/* LLT R/W/Init function */
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 0704fa3156af..0a720fa7ca78 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -835,9 +835,6 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
struct led_priv *ledpriv = &Adapter->ledpriv;
u8 eeValue;
- /* Read EEPROM size before call any EEPROM function */
- Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter);
-
/* check system boot selection */
eeValue = rtw_read8(Adapter, REG_9346CR);
eeprom->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM);
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 894e70a0d506..09fc27082f7c 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -177,7 +177,6 @@ struct adapter {
s32 bSurpriseRemoved;
s32 bCardDisableWOHSM;
- u8 EepromAddressSize;
u8 hw_init_completed;
s8 signal_strength;
diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 44321a53a345..82cb4f7f4d3e 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -176,7 +176,6 @@ struct hal_data_8188e {
s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);
/* EFuse */
-u8 GetEEPROMSize8188E(struct adapter *padapter);
void Hal_EfuseParseIDCode88E(struct adapter *padapter, u8 *hwinfo);
void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,
bool AutoLoadFail);
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] staging: r8188eu: remove unused function prototype
2022-02-25 12:08 [PATCH 0/4] staging: r8188eu: some simple cleanups Michael Straube
2022-02-25 12:08 ` [PATCH 1/4] staging: r8188eu: EepromAddressSize is set but not used Michael Straube
@ 2022-02-25 12:08 ` Michael Straube
2022-02-25 12:08 ` [PATCH 3/4] staging: r8188eu: remove update_bcn_p2p_ie() Michael Straube
2022-02-25 12:08 ` [PATCH 4/4] staging: r8188eu: remove ETH_ALEN from ieee80211.h Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2022-02-25 12:08 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The function prototype rtl8188e_query_rx_phy_status() is not used.
Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/rtl8188e_recv.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/staging/r8188eu/include/rtl8188e_recv.h
index 0be9896eaf0f..87dd4152082a 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_recv.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h
@@ -42,7 +42,6 @@ s32 rtl8188eu_init_recv_priv(struct adapter *padapter);
void rtl8188eu_free_recv_priv(struct adapter * padapter);
void rtl8188eu_recv_hdl(struct adapter * padapter, struct recv_buf *precvbuf);
void rtl8188eu_recv_tasklet(unsigned long priv);
-void rtl8188e_query_rx_phy_status(struct recv_frame *fr, struct phy_stat *phy);
void rtl8188e_process_phy_info(struct adapter * padapter, void *prframe);
void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat *phy);
void update_recvframe_attrib_88e(struct recv_frame *fra, struct recv_stat *stat);
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] staging: r8188eu: remove update_bcn_p2p_ie()
2022-02-25 12:08 [PATCH 0/4] staging: r8188eu: some simple cleanups Michael Straube
2022-02-25 12:08 ` [PATCH 1/4] staging: r8188eu: EepromAddressSize is set but not used Michael Straube
2022-02-25 12:08 ` [PATCH 2/4] staging: r8188eu: remove unused function prototype Michael Straube
@ 2022-02-25 12:08 ` Michael Straube
2022-02-25 12:08 ` [PATCH 4/4] staging: r8188eu: remove ETH_ALEN from ieee80211.h Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2022-02-25 12:08 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The function update_bcn_p2p_ie() is empty. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_ap.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ap.c b/drivers/staging/r8188eu/core/rtw_ap.c
index ed66331de319..2ff78ed1faab 100644
--- a/drivers/staging/r8188eu/core/rtw_ap.c
+++ b/drivers/staging/r8188eu/core/rtw_ap.c
@@ -613,16 +613,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)
kfree(pbackup_remainder_ie);
}
-static void update_bcn_p2p_ie(struct adapter *padapter)
-{
-}
-
static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui)
{
if (!memcmp(WPS_OUI, oui, 4))
update_bcn_wps_ie(padapter);
- else if (!memcmp(P2P_OUI, oui, 4))
- update_bcn_p2p_ie(padapter);
}
void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] staging: r8188eu: remove ETH_ALEN from ieee80211.h
2022-02-25 12:08 [PATCH 0/4] staging: r8188eu: some simple cleanups Michael Straube
` (2 preceding siblings ...)
2022-02-25 12:08 ` [PATCH 3/4] staging: r8188eu: remove update_bcn_p2p_ie() Michael Straube
@ 2022-02-25 12:08 ` Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2022-02-25 12:08 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The definition of ETH_ALEN in ieee80211.h is redundant as it is an
in-kernel constant. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/ieee80211.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index 1793b99feb9f..3a860e132cbd 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -11,7 +11,6 @@
#define MGMT_QUEUE_NUM 5
-#define ETH_ALEN 6
#define ETH_TYPE_LEN 2
#define PAYLOAD_TYPE_LEN 1
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread