projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 92d995d)
staging: rtl8192e: Remove unnecessary u8 assignment cast
authorSolomon Tan <wjsota@gmail.com>
Sat, 23 Apr 2022 13:01:44 +0000 (21:01 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Apr 2022 09:35:18 +0000 (11:35 +0200)
Remove the explicit casts in assignment statements for u8 variables.
Because these variables are declared as u8, there is implicit conversion
to u8 during the assignment, so an explicit cast is unnecessary.

Signed-off-by: Solomon Tan <wjsota@gmail.com>
Link: https://lore.kernel.org/r/20220423130150.161903-2-wjsota@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c patch | blob | blame | history
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c patch | blob | blame | history
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c patch | blob | blame | history
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c patch | blob | blame | history

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
index 52eeb56c5c76dbab4ba2151559384cd9c6bf30d0..4abec7b429939246c4c56bab23096dc09d41a914 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -185,10 +185,10 @@ void rtl92e_set_ofdm_tx_power(struct net_device *dev, u8 powerlevel)
        for (index = 0; index < 6; index++) {
                writeVal = (u32)(priv->MCSTxPowerLevelOriginalOffset[index] +
                           ((index < 2) ? powerBase0 : powerBase1));
-               byte0 = (u8)(writeVal & 0x7f);
-               byte1 = (u8)((writeVal & 0x7f00)>>8);
-               byte2 = (u8)((writeVal & 0x7f0000)>>16);
-               byte3 = (u8)((writeVal & 0x7f000000)>>24);
+               byte0 = writeVal & 0x7f;
+               byte1 = (writeVal & 0x7f00) >> 8;
+               byte2 = (writeVal & 0x7f0000) >> 16;
+               byte3 = (writeVal & 0x7f000000) >> 24;
                if (byte0 > 0x24)
                        byte0 = 0x24;
                if (byte1 > 0x24)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index a45ee95a8e6be28ae8aecf8f607f11f923c1a95b..4b31fecde4e6cfa2ae8bc529ad3a34fa2b18edc6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -321,7 +321,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 
                usValue = rtl92e_eeprom_read(dev,
                                             (u16)(EEPROM_Customer_ID>>1)) >> 8;
-               priv->eeprom_CustomerID = (u8)(usValue & 0xff);
+               priv->eeprom_CustomerID = usValue & 0xff;
                usValue = rtl92e_eeprom_read(dev,
                                             EEPROM_ICVersion_ChannelPlan>>1);
                priv->eeprom_ChannelPlan = usValue&0xff;
@@ -399,9 +399,9 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                        priv->EEPROMLegacyHTTxPowerDiff);
 
                if (!priv->AutoloadFailFlag)
-                       priv->EEPROMThermalMeter = (u8)(((rtl92e_eeprom_read(dev,
+                       priv->EEPROMThermalMeter = ((rtl92e_eeprom_read(dev,
                                                   (EEPROM_ThermalMeter>>1))) &
-                                                  0xff00)>>8);
+                                                  0xff00) >> 8;
                else
                        priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;
                RT_TRACE(COMP_INIT, "ThermalMeter = %d\n",
@@ -413,8 +413,8 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                                usValue = rtl92e_eeprom_read(dev,
                                          EEPROM_TxPwDiff_CrystalCap >> 1);
                                priv->EEPROMAntPwDiff = usValue & 0x0fff;
-                               priv->EEPROMCrystalCap = (u8)((usValue & 0xf000)
-                                                        >> 12);
+                               priv->EEPROMCrystalCap = (usValue & 0xf000)
+                                                        >> 12;
                        } else {
                                priv->EEPROMAntPwDiff =
                                         EEPROM_Default_AntTxPowerDiff;
@@ -894,9 +894,8 @@ start:
 
                        for (i = 0; i < TxBBGainTableLength; i++) {
                                if (tmpRegA == dm_tx_bb_gain[i]) {
-                                       priv->rfa_txpowertrackingindex = (u8)i;
-                                       priv->rfa_txpowertrackingindex_real =
-                                                (u8)i;
+                                       priv->rfa_txpowertrackingindex = i;
+                                       priv->rfa_txpowertrackingindex_real = i;
                                        priv->rfa_txpowertracking_default =
                                                 priv->rfa_txpowertrackingindex;
                                        break;
@@ -908,7 +907,7 @@ start:
 
                        for (i = 0; i < CCKTxBBGainTableLength; i++) {
                                if (TempCCk == dm_cck_tx_bb_gain[i][0]) {
-                                       priv->CCKPresentAttentuation_20Mdefault = (u8)i;
+                                       priv->CCKPresentAttentuation_20Mdefault = i;
                                        break;
                                }
                        }
@@ -1303,7 +1302,7 @@ void  rtl92e_fill_tx_cmd_desc(struct net_device *dev, struct tx_desc_cmd *entry,
                                      entry_tmp->Offset);
                entry_tmp->QueueSelect = QSLT_CMD;
                entry_tmp->TxFWInfoSize = 0x08;
-               entry_tmp->RATid = (u8)DESC_PACKET_TYPE_INIT;
+               entry_tmp->RATid = DESC_PACKET_TYPE_INIT;
        }
        entry->TxBufferSize = skb->len;
        entry->TxBuffAddr = mapping;
@@ -1613,9 +1612,8 @@ static void _rtl92e_query_rxphystatus(
                                total_rssi += RSSI;
 
                        if (bpacket_match_bssid) {
-                               pstats->RxMIMOSignalStrength[i] = (u8)RSSI;
-                               precord_stats->RxMIMOSignalStrength[i] =
-                                                               (u8)RSSI;
+                               pstats->RxMIMOSignalStrength[i] = RSSI;
+                               precord_stats->RxMIMOSignalStrength[i] = RSSI;
                        }
                }
 
@@ -1661,14 +1659,14 @@ static void _rtl92e_query_rxphystatus(
 
        if (is_cck_rate) {
                pstats->SignalStrength = precord_stats->SignalStrength =
-                                        (u8)(_rtl92e_signal_scale_mapping(priv,
-                                        (long)pwdb_all));
+                                        _rtl92e_signal_scale_mapping(priv,
+                                        (long)pwdb_all);
 
        } else {
                if (rf_rx_num != 0)
                        pstats->SignalStrength = precord_stats->SignalStrength =
-                                        (u8)(_rtl92e_signal_scale_mapping(priv,
-                                        (long)(total_rssi /= rf_rx_num)));
+                                        _rtl92e_signal_scale_mapping(priv,
+                                        (long)(total_rssi /= rf_rx_num));
        }
 }
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 411138102948afa995ce6ad9937ca9cd4e2eb3e9..c7071e0997bcc58c8e3d36c58886dc81b62a0106 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -1299,17 +1299,17 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
                            DIG_ALGO_BY_FALSE_ALARM)
                                rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8);
                        priv->initgain_backup.xaagccore1 =
-                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1,
-                                                      BitMask);
+                                rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1,
+                                                  BitMask);
                        priv->initgain_backup.xbagccore1 =
-                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1,
-                                                      BitMask);
+                                rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1,
+                                                  BitMask);
                        priv->initgain_backup.xcagccore1 =
-                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1,
-                                                      BitMask);
+                                rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1,
+                                                  BitMask);
                        priv->initgain_backup.xdagccore1 =
-                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1,
-                                                      BitMask);
+                                rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1,
+                                                  BitMask);
                        BitMask = bMaskByte2;
                        priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev,
                                                    rCCK0_CCA, BitMask);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index aa942d915992211bfe806126043c2b85afcb7de8..c85b234157722d459db645ef99f0ec43336dd0de 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -633,7 +633,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
        rtl92e_writeb(dev, FW_Busy_Flag, 0);
        priv->rtllib->bdynamic_txpower_enable = false;
 
-       powerlevelOFDM24G = (u8)(priv->Pwr_Track>>24);
+       powerlevelOFDM24G = priv->Pwr_Track >> 24;
        RF_Type = priv->rf_type;
        Value = (RF_Type<<8) | powerlevelOFDM24G;
 
@@ -833,7 +833,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                                            bMaskDWord);
                for (i = 0; i < OFDM_Table_Length; i++) {
                        if (tmpRegA == OFDMSwingTable[i]) {
-                               priv->OFDM_index[0] = (u8)i;
+                               priv->OFDM_index[0] = i;
                                RT_TRACE(COMP_POWER_TRACKING,
                                         "Initial reg0x%x = 0x%x, OFDM_index = 0x%x\n",
                                         rOFDM0_XATxIQImbalance, tmpRegA,
@@ -844,7 +844,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
                TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
                for (i = 0; i < CCK_Table_length; i++) {
                        if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
-                               priv->CCK_index = (u8)i;
+                               priv->CCK_index = i;
                                RT_TRACE(COMP_POWER_TRACKING,
                                         "Initial reg0x%x = 0x%x, CCK_index = 0x%x\n",
                                         rCCK0_TxFilter1, TempCCk,
@@ -1041,7 +1041,7 @@ static void _rtl92e_dm_cck_tx_power_adjust_tssi(struct net_device *dev,
 {
        u32 TempVal;
        struct r8192_priv *priv = rtllib_priv(dev);
-       u8 attenuation = (u8)priv->CCKPresentAttentuation;
+       u8 attenuation = priv->CCKPresentAttentuation;
 
        TempVal = 0;
        if (!bInCH14) {
@@ -1245,10 +1245,10 @@ void rtl92e_dm_backup_state(struct net_device *dev)
                return;
 
        rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8);
-       priv->initgain_backup.xaagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask);
-       priv->initgain_backup.xbagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask);
-       priv->initgain_backup.xcagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask);
-       priv->initgain_backup.xdagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask);
+       priv->initgain_backup.xaagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask);
+       priv->initgain_backup.xbagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask);
+       priv->initgain_backup.xcagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask);
+       priv->initgain_backup.xdagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask);
        bit_mask  = bMaskByte2;
        priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_mask);
 
@@ -1535,7 +1535,7 @@ static void _rtl92e_dm_initial_gain(struct net_device *dev)
 
        if ((dm_digtable.pre_ig_value != dm_digtable.cur_ig_value)
            || !initialized || force_write) {
-               initial_gain = (u8)dm_digtable.cur_ig_value;
+               initial_gain = dm_digtable.cur_ig_value;
                rtl92e_writeb(dev, rOFDM0_XAAGCCore1, initial_gain);
                rtl92e_writeb(dev, rOFDM0_XBAGCCore1, initial_gain);
                rtl92e_writeb(dev, rOFDM0_XCAGCCore1, initial_gain);
Linux 6.x block layer and io_uring tree(s)