Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: rtlwifi: Remove rtl_intf_ops.read_efuse_byte 

PCI drivers and USB drivers can both use the same function,
read_efuse_byte(), and they can call it directly.

rtl8192de was the only user.

Tested only with the upcoming rtl8192du driver.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/4e2c968d-f25c-4a40-be97-4fdcbdde69cf@gmail.com
This commit is contained in:
Bitterblue Smith 2024-02-27 14:15:52 +02:00 committed by Kalle Valo
parent c238adbc57
commit 7979061313
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/realtek/rtlwifi/pci.c
View File

@ -2374,7 +2374,6 @@ EXPORT_SYMBOL(rtl_pci_resume);
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
const struct rtl_intf_ops rtl_pci_ops = { const struct rtl_intf_ops rtl_pci_ops = {
.read_efuse_byte = read_efuse_byte,
.adapter_start = rtl_pci_start, .adapter_start = rtl_pci_start,
.adapter_stop = rtl_pci_stop, .adapter_stop = rtl_pci_stop,
.check_buddy_priv = rtl_pci_check_buddy_priv, .check_buddy_priv = rtl_pci_check_buddy_priv,

6
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
View File

@ -1669,10 +1669,8 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw)
u8 cutvalue[2]; u8 cutvalue[2];
u16 chipvalue; u16 chipvalue;
rtlpriv->intf_ops->read_efuse_byte(hw, EEPROME_CHIP_VERSION_H, read_efuse_byte(hw, EEPROME_CHIP_VERSION_H, &cutvalue[1]);
&cutvalue[1]); read_efuse_byte(hw, EEPROME_CHIP_VERSION_L, &cutvalue[0]);
rtlpriv->intf_ops->read_efuse_byte(hw, EEPROME_CHIP_VERSION_L,
&cutvalue[0]);
chipvalue = (cutvalue[1] << 8) | cutvalue[0]; chipvalue = (cutvalue[1] << 8) | cutvalue[0];
switch (chipvalue) { switch (chipvalue) {
case 0xAA55: case 0xAA55:

1
drivers/net/wireless/realtek/rtlwifi/wifi.h
View File

@ -2289,7 +2289,6 @@ struct rtl_hal_ops {
struct rtl_intf_ops { struct rtl_intf_ops {
/*com */ /*com */
void (*read_efuse_byte)(struct ieee80211_hw *hw, u16 _offset, u8 *pbuf);
int (*adapter_start)(struct ieee80211_hw *hw); int (*adapter_start)(struct ieee80211_hw *hw);
void (*adapter_stop)(struct ieee80211_hw *hw); void (*adapter_stop)(struct ieee80211_hw *hw);
bool (*check_buddy_priv)(struct ieee80211_hw *hw, bool (*check_buddy_priv)(struct ieee80211_hw *hw,