staging: r8188eu: remove two checks that are always false

Commit aefb1fc5c185 ("staging: r8188eu: odm BoardType is never set")
clarified that the odm board type is always 0.

The CheckCondition functions extract the board type from the hex
parameter and stores it in _board. For _board == 0,
(_board == cond) && cond != 0x00 is always false. Remove the checks.

Acked-by: Michael Straube <straube.linux@gmail.com>
Acked-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211016113008.27549-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
index a623e0aaa0d0cc903193baddb42227d9d99379a6..f6e4243e0c7baffe4346105fd6bdc93070f558a9 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
+++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
@@ -13,7 +13,6 @@
 
 static bool CheckCondition(const u32  condition, const u32  hex)
 {
-       u32 _board     = (hex & 0x000000FF);
        u32 _interface = (hex & 0x0000FF00) >> 8;
        u32 _platform  = (hex & 0x00FF0000) >> 16;
        u32 cond = condition;
@@ -21,10 +20,6 @@ static bool CheckCondition(const u32  condition, const u32  hex)
        if (condition == 0xCDCDCDCD)
                return true;
 
-       cond = condition & 0x000000FF;
-       if ((_board == cond) && cond != 0x00)
-               return false;
-
        cond = condition & 0x0000FF00;
        cond = cond >> 8;
        if ((_interface & cond) == 0 && cond != 0x07)

diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
index 3e2a09fc261988aab665d1ca59e267d412f1ffb7..5e0a96200078028ced4da731a269ced839d54823 100644 (file)
--- a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
+++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
@@ -6,7 +6,6 @@
 
 static bool CheckCondition(const u32  Condition, const u32  Hex)
 {
-       u32 _board     = (Hex & 0x000000FF);
        u32 _interface = (Hex & 0x0000FF00) >> 8;
        u32 _platform  = (Hex & 0x00FF0000) >> 16;
        u32 cond = Condition;
@@ -14,10 +13,6 @@ static bool CheckCondition(const u32  Condition, const u32  Hex)
        if (Condition == 0xCDCDCDCD)
                return true;
 
-       cond = Condition & 0x000000FF;
-       if ((_board == cond) && cond != 0x00)
-               return false;
-
        cond = Condition & 0x0000FF00;
        cond = cond >> 8;
        if ((_interface & cond) == 0 && cond != 0x07)