staging: rtl8723bs: change custom comparing function to strcmp()

eqNByte() function is a redundant reimplementation of strcmp().
Remove eqNByte() and switch its usages to strcmp().
No functional change.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bera Yüzlü <b9788213@gmail.com>
Link: https://patch.msgid.link/20260309184556.846-2-b9788213@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 31b3e880ae6ab7e1adc9ee4006d81793d931ff53..a7720f821823ee4728a26d25ba17bbb741ab0e8f 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -750,18 +750,6 @@ void SetHalODMVar(
 }
 
 
-bool eqNByte(u8 *str1, u8 *str2, u32 num)
-{
-       if (num == 0)
-               return false;
-       while (num > 0) {
-               num--;
-               if (str1[num] != str2[num])
-                       return false;
-       }
-       return true;
-}
-
 bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt)
 {
        u16 i = 0;

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index dc2da49e6738e0bd1f1b60fc39b201ee44c64187..61c6b6e10de81b4a434d7f1a58bf6463bb1d40ed 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -8,6 +8,7 @@
 #include <drv_types.h>
 #include <hal_data.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 
 u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
                            enum rate_section RateSection)
@@ -819,27 +820,27 @@ void PHY_SetTxPowerLimit(
 
        powerLimit = powerLimit > MAX_POWER_INDEX ? MAX_POWER_INDEX : powerLimit;
 
-       if (eqNByte(Regulation, (u8 *)("FCC"), 3))
+       if (strcmp(Regulation, "FCC") == 0)
                regulation = 0;
-       else if (eqNByte(Regulation, (u8 *)("MKK"), 3))
+       else if (strcmp(Regulation, "MKK") == 0)
                regulation = 1;
-       else if (eqNByte(Regulation, (u8 *)("ETSI"), 4))
+       else if (strcmp(Regulation, "ETSI") == 0)
                regulation = 2;
-       else if (eqNByte(Regulation, (u8 *)("WW13"), 4))
+       else if (strcmp(Regulation, "WW13") == 0)
                regulation = 3;
 
-       if (eqNByte(RateSection, (u8 *)("CCK"), 3) && eqNByte(RfPath, (u8 *)("1T"), 2))
+       if (strcmp(RateSection, "CCK") == 0 && strcmp(RfPath, "1T") == 0)
                rateSection = 0;
-       else if (eqNByte(RateSection, (u8 *)("OFDM"), 4) && eqNByte(RfPath, (u8 *)("1T"), 2))
+       else if (strcmp(RateSection, "OFDM") == 0 && strcmp(RfPath, "1T") == 0)
                rateSection = 1;
-       else if (eqNByte(RateSection, (u8 *)("HT"), 2) && eqNByte(RfPath, (u8 *)("1T"), 2))
+       else if (strcmp(RateSection, "HT") == 0 && strcmp(RfPath, "1T") == 0)
                rateSection = 2;
        else
                return;
 
-       if (eqNByte(Bandwidth, (u8 *)("20M"), 3))
+       if (strcmp(Bandwidth, "20M") == 0)
                bandwidth = 0;
-       else if (eqNByte(Bandwidth, (u8 *)("40M"), 3))
+       else if (strcmp(Bandwidth, "40M") == 0)
                bandwidth = 1;
 
        channelIndex = phy_GetChannelIndexOfTxPowerLimit(channel);

diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index 74d6c892c4013baac4b848b8b63188407890bcc6..483f0390addcaec58aede39094f26c8cae9b3fcd 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -141,8 +141,6 @@ void rtw_hal_check_rxfifo_full(struct adapter *adapter);
 u8 GetHalDefVar(struct adapter *adapter, enum hal_def_variable variable,
                void *value);
 
-bool eqNByte(u8 *str1, u8 *str2, u32 num);
-
 bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 *in);
 
 #define                HWSET_MAX_SIZE                  512