byte() in wifi.h has a single user. rtl8192se takes the low byte of the firmware header version with it, which is just a mask. Open code that as & 0xff. packet_get_type() and FILL_OCTET_STRING() have no users at all. packet_get_type() also refers to EF1BYTE(), which no longer exists in the driver, so it could not be used even if someone wanted to. Remove the three macros. No functional change intended. Signed-off-by: Rishik Yechuri Assisted-by: Claude:claude-fable-5-1 --- drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 2 +- drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c index 0719d0bb2cac..c18d5fffb0a1 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c @@ -334,7 +334,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) /* 1. Retrieve FW header. */ firmware->pfwheader = (struct fw_hdr *) puc_mappedfile; pfwheader = firmware->pfwheader; - firmware->firmwareversion = byte(pfwheader->version, 0); + firmware->firmwareversion = pfwheader->version & 0xff; firmware->pfwheader->fwpriv.hci_sel = 1;/* pcie */ rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index e289a88e9666..98b685754e8a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2806,9 +2806,6 @@ enum bt_radio_shared { BT_RADIO_INDIVIDUAL = 1, }; -#define byte(x, n) ((x >> (8 * n)) & 0xff) - -#define packet_get_type(_packet) (EF1BYTE((_packet).octet[0]) & 0xFC) #define RTL_WATCH_DOG_TIME 2000 #define rtl_dm(rtlpriv) (&((rtlpriv)->dm)) @@ -2833,10 +2830,6 @@ enum bt_radio_shared { #define RT_SET_PS_LEVEL(ppsc, _ps_flg) \ (ppsc->cur_ps_level |= _ps_flg) -#define FILL_OCTET_STRING(_os, _octet, _len) \ - (_os).octet = (u8 *)(_octet); \ - (_os).length = (_len); - #define LDPC_HT_ENABLE_RX BIT(0) #define LDPC_HT_ENABLE_TX BIT(1) #define LDPC_HT_TEST_TX_ENABLE BIT(2) -- 2.43.0