staging: rtl8192e: Use min_t/max_t macros for variable comparison

Simplify code by using min_t and max_t helper macros in place of lengthy
if/else block oriented logical evaluation and value assignment. This
issue is identified by coccicheck using the minmax.cocci file.

Use the *_t variants of min/max macros to avoid compiler warnings about
data typecast.
Also, use u32 as type for min_t macro to avoid any truncation of data
associated with enum constant HT_AGG_SIZE_32K.

Signed-off-by: Deepak R Varma <drv@mailo.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/Y2LxC2kziM1TznhO@qemulion
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 62aa8e893c34c3f5ced604b1377ebf10ad93f5cd..ccb86660ab48764e4906c14c3f625815b5255c5a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -587,17 +587,12 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
                        else
                                pHTInfo->CurrentAMPDUFactor = HT_AGG_SIZE_64K;
                } else {
-                       if (pPeerHTCap->MaxRxAMPDUFactor < HT_AGG_SIZE_32K)
-                               pHTInfo->CurrentAMPDUFactor =
-                                                pPeerHTCap->MaxRxAMPDUFactor;
-                       else
-                               pHTInfo->CurrentAMPDUFactor = HT_AGG_SIZE_32K;
+                       pHTInfo->CurrentAMPDUFactor = min_t(u32, pPeerHTCap->MaxRxAMPDUFactor,
+                                                           HT_AGG_SIZE_32K);
                }
        }
-       if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity)
-               pHTInfo->current_mpdu_density = pHTInfo->MPDU_Density;
-       else
-               pHTInfo->current_mpdu_density = pPeerHTCap->MPDUDensity;
+       pHTInfo->current_mpdu_density = max_t(u8, pHTInfo->MPDU_Density,
+                                             pPeerHTCap->MPDUDensity);
        if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {
                pHTInfo->bCurrentAMPDUEnable = false;
                pHTInfo->ForcedAMSDUMode = HT_AGG_FORCE_ENABLE;