Rename variables in function _rtl92e_dm_tx_power_tracking_cb_thermal
and Refactor variable assignment to avoid checkpatch complains.
The patches are required to be applied in sequence.
Yogesh Hegde (4):
staging: rtl8192e: Rename tmpRegA and TempCCk
staging: rtl8192e: Rename tmpOFDMindex and tmpCCKindex
staging: rtl8192e: Rename tmpCCK20Mindex and tmpCCK40Mindex
staging: rtl8192e: Refactor tmp_ofdm_index variable assignment
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 68 +++++++++++-----------
1 file changed, 34 insertions(+), 34 deletions(-)
--
2.34.1
Rename variable tmpRegA to tmp_reg, TempCCk to tmp_cck
to avoid CamelCase which is not accepted by checkpatch.
Signed-off-by: Yogesh Hegde <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 56a8ec517c06..af136abc595c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -657,21 +657,21 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
{
#define ThermalMeterVal 9
struct r8192_priv *priv = rtllib_priv(dev);
- u32 tmpRegA, TempCCk;
+ u32 tmp_reg, tmp_cck;
u8 tmpOFDMindex, tmpCCKindex, tmpCCK20Mindex, tmpCCK40Mindex, tmpval;
int i = 0, CCKSwingNeedUpdate = 0;
if (!priv->tx_pwr_tracking_init) {
- tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
+ tmp_reg = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
bMaskDWord);
for (i = 0; i < OFDM_TABLE_LEN; i++) {
- if (tmpRegA == OFDMSwingTable[i])
+ if (tmp_reg == OFDMSwingTable[i])
priv->ofdm_index[0] = i;
}
- TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
+ tmp_cck = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
for (i = 0; i < CCK_TABLE_LEN; i++) {
- if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
+ if (tmp_cck == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
priv->cck_index = i;
break;
}
@@ -680,17 +680,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
return;
}
- tmpRegA = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
- if (tmpRegA < 3 || tmpRegA > 13)
+ tmp_reg = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
+ if (tmp_reg < 3 || tmp_reg > 13)
return;
- if (tmpRegA >= 12)
- tmpRegA = 12;
+ if (tmp_reg >= 12)
+ tmp_reg = 12;
priv->thermal_meter[0] = ThermalMeterVal;
priv->thermal_meter[1] = ThermalMeterVal;
- if (priv->thermal_meter[0] >= (u8)tmpRegA) {
+ if (priv->thermal_meter[0] >= (u8)tmp_reg) {
tmpOFDMindex = tmpCCK20Mindex = 6+(priv->thermal_meter[0] -
- (u8)tmpRegA);
+ (u8)tmp_reg);
tmpCCK40Mindex = tmpCCK20Mindex - 6;
if (tmpOFDMindex >= OFDM_TABLE_LEN)
tmpOFDMindex = OFDM_TABLE_LEN - 1;
@@ -699,7 +699,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
if (tmpCCK40Mindex >= CCK_TABLE_LEN)
tmpCCK40Mindex = CCK_TABLE_LEN - 1;
} else {
- tmpval = (u8)tmpRegA - priv->thermal_meter[0];
+ tmpval = (u8)tmp_reg - priv->thermal_meter[0];
if (tmpval >= 6) {
tmpOFDMindex = 0;
tmpCCK20Mindex = 0;
--
2.34.1
On Wed, May 10, 2023 at 08:39:07PM +0530, Yogesh Hegde wrote:
> @@ -680,17 +680,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
> return;
> }
>
> - tmpRegA = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> - if (tmpRegA < 3 || tmpRegA > 13)
> + tmp_reg = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> + if (tmp_reg < 3 || tmp_reg > 13)
> return;
> - if (tmpRegA >= 12)
> - tmpRegA = 12;
> + if (tmp_reg >= 12)
> + tmp_reg = 12;
Not related to your patch (which is fine) but this if statement can be
deleted.
> priv->thermal_meter[0] = ThermalMeterVal;
> priv->thermal_meter[1] = ThermalMeterVal;
>
> - if (priv->thermal_meter[0] >= (u8)tmpRegA) {
> + if (priv->thermal_meter[0] >= (u8)tmp_reg) {
And casting tmp_reg to u8 is nonsense so that casting can be deleted too.
2 separate patches:
patch 1: delete unecessary if statement
patch 2: delete unecessary casting
regards,
dan carpenter
On Wed, May 10, 2023 at 07:56:29PM +0300, Dan Carpenter wrote:
> On Wed, May 10, 2023 at 08:39:07PM +0530, Yogesh Hegde wrote:
> > @@ -680,17 +680,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
> > return;
> > }
> >
> > - tmpRegA = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> > - if (tmpRegA < 3 || tmpRegA > 13)
> > + tmp_reg = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> > + if (tmp_reg < 3 || tmp_reg > 13)
> > return;
> > - if (tmpRegA >= 12)
> > - tmpRegA = 12;
> > + if (tmp_reg >= 12)
> > + tmp_reg = 12;
>
> Not related to your patch (which is fine) but this if statement can be
> deleted.
>
> > priv->thermal_meter[0] = ThermalMeterVal;
> > priv->thermal_meter[1] = ThermalMeterVal;
> >
> > - if (priv->thermal_meter[0] >= (u8)tmpRegA) {
> > + if (priv->thermal_meter[0] >= (u8)tmp_reg) {
>
> And casting tmp_reg to u8 is nonsense so that casting can be deleted too.
> 2 separate patches:
> patch 1: delete unecessary if statement
> patch 2: delete unecessary casting
Thank you for taking the time to review my patch and provide your
feedback. Your suggestions are duly noted, and I appreciate your
guidance.
I will make them into separate patches and submit it.
Thank you for your time and valuable input.
Regards
Yogesh
On Thu, May 11, 2023 at 07:48:23PM +0530, Yogesh Hegde wrote:
> On Wed, May 10, 2023 at 07:56:29PM +0300, Dan Carpenter wrote:
> > On Wed, May 10, 2023 at 08:39:07PM +0530, Yogesh Hegde wrote:
> > > @@ -680,17 +680,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
> > > return;
> > > }
> > >
> > > - tmpRegA = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> > > - if (tmpRegA < 3 || tmpRegA > 13)
> > > + tmp_reg = rtl92e_get_rf_reg(dev, RF90_PATH_A, 0x12, 0x078);
> > > + if (tmp_reg < 3 || tmp_reg > 13)
> > > return;
> > > - if (tmpRegA >= 12)
> > > - tmpRegA = 12;
> > > + if (tmp_reg >= 12)
> > > + tmp_reg = 12;
> >
> > Not related to your patch (which is fine) but this if statement can be
> > deleted.
> >
> > > priv->thermal_meter[0] = ThermalMeterVal;
> > > priv->thermal_meter[1] = ThermalMeterVal;
> > >
> > > - if (priv->thermal_meter[0] >= (u8)tmpRegA) {
> > > + if (priv->thermal_meter[0] >= (u8)tmp_reg) {
> >
> > And casting tmp_reg to u8 is nonsense so that casting can be deleted too.
> > 2 separate patches:
> > patch 1: delete unecessary if statement
> > patch 2: delete unecessary casting
>
> Thank you for taking the time to review my patch and provide your
> feedback. Your suggestions are duly noted, and I appreciate your
> guidance.
>
> I will make them into separate patches and submit it.
You don't have to if you don't want to. We can apply the patches you
sent as-is. (No need to resend). This was just in case anyone felt
motivated to do some more clean up work.
regards,
dan carpenter
On Thu, May 11, 2023 at 05:21:07PM +0300, Dan Carpenter wrote:
> On Thu, May 11, 2023 at 07:48:23PM +0530, Yogesh Hegde wrote:
> >
> > Thank you for taking the time to review my patch and provide your
> > feedback. Your suggestions are duly noted, and I appreciate your
> > guidance.
> >
> > I will make them into separate patches and submit it.
>
> You don't have to if you don't want to. We can apply the patches you
> sent as-is. (No need to resend). This was just in case anyone felt
> motivated to do some more clean up work.
Ok noted. Since the patches can be applied without further changes,
I won't resend the current patchset. But I am eager to do more
clean up work, so I will definitely take your suggestions into
account and incorporate them in my future patches.
Thank you for your feedback and support.
Regards
Yogesh
On 5/10/23 17:08, Yogesh Hegde wrote:
> Rename variables in function _rtl92e_dm_tx_power_tracking_cb_thermal
> and Refactor variable assignment to avoid checkpatch complains.
> The patches are required to be applied in sequence.
>
> Yogesh Hegde (4):
> staging: rtl8192e: Rename tmpRegA and TempCCk
> staging: rtl8192e: Rename tmpOFDMindex and tmpCCKindex
> staging: rtl8192e: Rename tmpCCK20Mindex and tmpCCK40Mindex
> staging: rtl8192e: Refactor tmp_ofdm_index variable assignment
>
> drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 68 +++++++++++-----------
> 1 file changed, 34 insertions(+), 34 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]>