Staging: vt6655: Remove dead functions.
v3 cover Staging: vt6655: Remove dead functions.
This patchset removes functions that are not called in the driver but are prototyped in card.h. Each commit limits its scope to one function definition and related documentation in code.
Functions were checked for calls using the Elixir Cross Referencer and git grep.
Per Stefano Brivio's recommendation, output of bloatometer script after changes:
add/remove: 0/3 grow/shrink: 0/0 up/down: 0/-532 (-532)
Function old new delta
CARDbSoftwareReset 10 - -10 CARDvSetLoopbackMode 14 - -14 CARDbRadioPowerOn 508 - -508
Total: Before=36131, After=35599, chg -1.47%
Briana Oursler (3):
Staging: vt6655: Remove CARDbSoftwareReset definition.
Staging: vt6655: Remove CARDvSetLoopbackMode definition.
Staging: vt6655: Remove CARDbRadioPowerOn definition.
Changes in v3:
- Update language in patch series name at suggestions from Stefano Brivio and Julia Lawall.
- Remove references to the changelog in the cover letter. It is unrelated to this series.
Changes in v2:
- Add output of bloatometer.
- Change language from "uncalled function" to "function...that is never called" in each patch in the series.
drivers/staging/vt6655/card.c | 105 ---------------------------------- drivers/staging/vt6655/card.h | 4 -- 2 files changed, 109 deletions(-)
Signature · 1 line
2.24.1
PATCH v3 1/3 Staging: vt6655: Remove CARDbSoftwareReset definition.
Remove function CARDbSoftwareReset that is never called, along with comments related to it.
--- drivers/staging/vt6655/card.c | 21 --------------------- drivers/staging/vt6655/card.h | 1 - 2 files changed, 22 deletions(-)
drivers/staging/vt6655/card.c +0 -21
@@ -12,7 +12,6 @@* CARDbAddBasicRate - Add to BasicRateSet * CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet * CARDvSetLoopbackMode - Set Loopback mode -* CARDbSoftwareReset - Sortware reset NIC * CARDqGetTSFOffset - Calculate TSFOffset * CARDbGetCurrentTSF - Read Current NIC TSF counter * CARDqGetNextTBTT - Calculate Next Beacon TSF counter
@@ -843,26 +842,6 @@ void CARDvSetLoopbackMode(struct vnt_private *priv,/* set Baseband loopback */ } -/* -* Description: Software Reset NIC -* -* Parameters: -* In: -* priv - The adapter to be reset -* Out: -* none -* -* Return Value: none -*/ -bool CARDbSoftwareReset (struct vnt_private *priv) -{ -/* reset MAC */ -if (!MACbSafeSoftwareReset (priv)) -return false; - -return true; -} -/* * Description: Calculate TSF offset of two TSF input * Get TSF Offset from RxBCN's TSF and local TSF
drivers/staging/vt6655/card.h +0 -1
@@ -46,7 +46,6 @@ void CARDvUpdateBasicTopRate(struct vnt_private *priv);bool CARDbIsOFDMinBasicRate (struct vnt_private *priv);void CARDvSetLoopbackMode (struct vnt_private *priv,unsigned short wLoopbackMode); -bool CARDbSoftwareReset (struct vnt_private *priv);void CARDvSetFirstNextTBTT (struct vnt_private *priv,unsigned short wBeaconInterval); void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
Signature · 1 line
2.24.1
PATCH v3 2/3 Staging: vt6655: Remove CARDvSetLoopbackMode definition.
In reply to Briana OurslerRemove function CARDvSetLoopbackMode that is never called, along with comments related to it.
--- drivers/staging/vt6655/card.c | 29 ----------------------------- drivers/staging/vt6655/card.h | 2 -- 2 files changed, 31 deletions(-)
drivers/staging/vt6655/card.c +0 -29
@@ -11,7 +11,6 @@* CARDvUpdateBasicTopRate - Update BasicTopRate * CARDbAddBasicRate - Add to BasicRateSet * CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet -* CARDvSetLoopbackMode - Set Loopback mode * CARDqGetTSFOffset - Calculate TSFOffset * CARDbGetCurrentTSF - Read Current NIC TSF counter * CARDqGetNextTBTT - Calculate Next Beacon TSF counter
@@ -814,34 +813,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv)return PK_TYPE_11GB ; } -/* -* Description: Set NIC Loopback mode -* -* Parameters: -* In: -* priv - The adapter to be set -* wLoopbackMode - Loopback mode to be set -* Out: -* none -* -* Return Value: none -*/ -void CARDvSetLoopbackMode (struct vnt_private *priv, -unsigned short wLoopbackMode) -{ -switch (wLoopbackMode) { -case CARD_LB_NONE : -case CARD_LB_MAC : -case CARD_LB_PHY : -break ; -default : -break ; - } -/* set MAC loopback */ -MACvSetLoopbackMode (priv,LOBYTE (wLoopbackMode)); -/* set Baseband loopback */ -} -/* * Description: Calculate TSF offset of two TSF input * Get TSF Offset from RxBCN's TSF and local TSF
drivers/staging/vt6655/card.h +0 -2
@@ -44,8 +44,6 @@ struct vnt_private;void CARDvSetRSPINF (struct vnt_private *priv,u8 bb_type);void CARDvUpdateBasicTopRate (struct vnt_private *priv);bool CARDbIsOFDMinBasicRate (struct vnt_private *priv); -void CARDvSetLoopbackMode (struct vnt_private *priv, -unsigned short wLoopbackMode);void CARDvSetFirstNextTBTT (struct vnt_private *priv,unsigned short wBeaconInterval); void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
Signature · 1 line
2.24.1
PATCH v3 3/3 Staging: vt6655: Remove CARDbRadioPowerOn definition.
In reply to Briana OurslerRemove function CARDbRadioPowerOn that is never called, along with comments related to it.
--- drivers/staging/vt6655/card.c | 55 ----------------------------------- drivers/staging/vt6655/card.h | 1 - 2 files changed, 56 deletions(-)
drivers/staging/vt6655/card.c +0 -55
@@ -17,7 +17,6 @@* CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDbRadioPowerOff - Turn Off NIC Radio Power -* CARDbRadioPowerOn - Turn On NIC Radio Power * * Revision History: * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
@@ -437,60 +436,6 @@ void CARDbRadioPowerOff(struct vnt_private *priv) LED_ACTSET); /* LED issue */ } -/* -* Description: Turn on Radio power -* -* Parameters: -* In: -* priv - The adapter to be turned on -* Out: -* none -* -* Return Value: true if success; otherwise false -*/ -bool CARDbRadioPowerOn (struct vnt_private *priv) -{ -bool bResult = true; - -pr_debug ("chester power on\n" ); -if (priv->bRadioControlOff) { -if (priv->bHWRadioOff) -pr_debug ("chester bHWRadioOff\n" ); -if (priv->bRadioControlOff) -pr_debug ("chester bRadioControlOff\n" ); -return false; } - -if (!priv->bRadioOff) { -pr_debug ("chester pbRadioOff\n" ); -return true; } - -BBvExitDeepSleep (priv, priv->byLocalID); - -MACvRegBitsOn (priv->PortOffset,MAC_REG_HOSTCR ,HOSTCR_RXON ); - -switch (priv->byRFType) { -case RF_RFMD2959 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_TXPEINV ); -MACvWordRegBitsOff (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_SWPE1 ); -break ; - -case RF_AIROHA : -case RF_AL2230S : -case RF_AIROHA7230 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 )); -break ; - } - - priv->bRadioOff = false; -pr_debug ("chester power on\n" ); -MACvRegBitsOff (priv->PortOffset,MAC_REG_GPIOCTL0 , -LED_ACTSET );/* LED issue */ -return bResult; -} -void CARDvSafeResetTx (struct vnt_private *priv) {unsigned int uu;
drivers/staging/vt6655/card.h +0 -1
@@ -55,7 +55,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv);void CARDvSafeResetTx (struct vnt_private *priv);void CARDvSafeResetRx (struct vnt_private *priv);void CARDbRadioPowerOff (struct vnt_private *priv); -bool CARDbRadioPowerOn (struct vnt_private *priv);bool CARDbSetPhyParameter (struct vnt_private *priv,u8 bb_type);bool CARDbUpdateTSF (struct vnt_private *priv,unsigned char byRxRate,u64 qwBSSTimestamp);
Signature · 1 line
2.24.1
Re: [Patch v3 3/3] Staging: vt6655: Remove CARDbRadioPowerOn definition.
Quoted 2 lines · Briana Oursler
Remove function CARDbRadioPowerOn that is never called, along with comments related to it.
Did you check whether any of the functions that it calls are only called from here?
julia
Quoted 96 lines
Signed-off-by Briana Oursler <[email protected]>--- drivers/staging/vt6655/card.c | 55 ----------------------------------- drivers/staging/vt6655/card.h | 1 - 2 files changed, 56 deletions(-)drivers/staging/vt6655/card.c +0
-55@@ -17,7 +17,6 @@* CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDbRadioPowerOff - Turn Off NIC Radio Power -* CARDbRadioPowerOn - Turn On NIC Radio Power * * Revision History: * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec. @@ -437,60 +436,6 @@ void CARDbRadioPowerOff(struct vnt_private *priv) LED_ACTSET); /* LED issue */ } -/* -* Description: Turn on Radio power -* -* Parameters: -* In: -* priv - The adapter to be turned on -* Out: -* none -* -* Return Value: true if success; otherwise false -*/ -bool CARDbRadioPowerOn (struct vnt_private *priv) -{ -bool bResult = true; - -pr_debug ("chester power on\n" ); -if (priv->bRadioControlOff) { -if (priv->bHWRadioOff) -pr_debug ("chester bHWRadioOff\n" ); -if (priv->bRadioControlOff) -pr_debug ("chester bRadioControlOff\n" ); -return false; } - -if (!priv->bRadioOff) { -pr_debug ("chester pbRadioOff\n" ); -return true; } - -BBvExitDeepSleep (priv, priv->byLocalID); - -MACvRegBitsOn (priv->PortOffset,MAC_REG_HOSTCR ,HOSTCR_RXON ); - -switch (priv->byRFType) { -case RF_RFMD2959 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_TXPEINV ); -MACvWordRegBitsOff (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_SWPE1 ); -break ; - -case RF_AIROHA : -case RF_AL2230S : -case RF_AIROHA7230 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 |SOFTPWRCTL_SWPE3 )); -break ; - } - - priv->bRadioOff = false; -pr_debug ("chester power on\n" ); -MACvRegBitsOff (priv->PortOffset,MAC_REG_GPIOCTL0 , -LED_ACTSET );/* LED issue */ -return bResult; -} -void CARDvSafeResetTx (struct vnt_private *priv) {unsigned int uu;drivers/staging/vt6655/card.h +0
-2@@ -55,7 +55,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv);void CARDvSafeResetTx (struct vnt_private *priv);void CARDvSafeResetRx (struct vnt_private *priv);void CARDbRadioPowerOff (struct vnt_private *priv); -bool CARDbRadioPowerOn (struct vnt_private *priv);bool CARDbSetPhyParameter (struct vnt_private *priv,u8 bb_type);bool CARDbUpdateTSF (struct vnt_private *priv,unsigned char byRxRate,u64 qwBSSTimestamp); --2.24.1
Re: [Patch v3 3/3] Staging: vt6655: Remove CARDbRadioPowerOn definition.
Quoted 9 lines · Julia Lawall
Quoted 2 lines · Briana Oursler
Remove function CARDbRadioPowerOn that is never called, along with comments related to it.
Did you check whether any of the functions that it calls are only called
from here?
Hi Julia,
It looks like there are. Should I remove them in additional commits and add them to the patch series?
Thanks,
Briana
Quoted 107 lines
julia
Quoted 104 lines
Signed-off-by Briana Oursler <[email protected]>--- drivers/staging/vt6655/card.c | 55 ----------------------------- ------ drivers/staging/vt6655/card.h | 1 - 2 files changed, 56 deletions(-)drivers/staging/vt6655/card.c +0
-1@@ -17,7 +17,6 @@* CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDbRadioPowerOff - Turn Off NIC Radio Power -* CARDbRadioPowerOn - Turn On NIC Radio Power * * Revision History: * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
drivers/staging/vt6655/card.c +0
-54@@ -437,60 +436,6 @@ void CARDbRadioPowerOff(struct vnt_private *priv) LED_ACTSET); /* LED issue */ } -/* -* Description: Turn on Radio power -* -* Parameters: -* In: -* priv - The adapter to be turned on -* Out: -* none -* -* Return Value: true if success; otherwise false -*/ -bool CARDbRadioPowerOn (struct vnt_private *priv) -{ -bool bResult = true; - -pr_debug ("chester power on\n" ); -if (priv->bRadioControlOff) { -if (priv->bHWRadioOff) -pr_debug ("chester bHWRadioOff\n" ); -if (priv->bRadioControlOff) -pr_debug ("chester bRadioControlOff\n" ); -return false; } - -if (!priv->bRadioOff) { -pr_debug ("chester pbRadioOff\n" ); -return true; } - -BBvExitDeepSleep (priv, priv->byLocalID); - -MACvRegBitsOn (priv->PortOffset,MAC_REG_HOSTCR ,HOSTCR_RXON ); - -switch (priv->byRFType) { -case RF_RFMD2959 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_TXPEINV ); -MACvWordRegBitsOff (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_SWPE1 ); -break ; - -case RF_AIROHA : -case RF_AL2230S : -case RF_AIROHA7230 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); -break ; - } - - priv->bRadioOff = false; -pr_debug ("chester power on\n" ); -MACvRegBitsOff (priv->PortOffset,MAC_REG_GPIOCTL0 , -LED_ACTSET );/* LED issue */ -return bResult; -} -void
CARDvSafeResetTx(struct vnt_private *priv)
{drivers/staging/vt6655/card.c +0
-0unsigned int uu;drivers/staging/vt6655/card.h +0
-1@@ -55,7 +55,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv);void CARDvSafeResetTx (struct vnt_private *priv);void CARDvSafeResetRx (struct vnt_private *priv);void CARDbRadioPowerOff (struct vnt_private *priv); -bool CARDbRadioPowerOn (struct vnt_private *priv);bool CARDbSetPhyParameter (struct vnt_private *priv,u8 bb_type); bool CARDbUpdateTSF(struct vnt_private *priv, unsigned charbyRxRate,
u64 qwBSSTimestamp);
--
2.24.1
Re: [Patch v3 3/3] Staging: vt6655: Remove CARDbRadioPowerOn definition.
Quoted 7 lines · Briana Oursler
Quoted 6 lines · Julia Lawall
Quoted 2 lines · Briana Oursler
Remove function CARDbRadioPowerOn that is never called, along with comments related to it.
Quoted 8 lines
Quoted 3 lines
Did you check whether any of the functions that it calls are only called
from here?Hi Julia,
It looks like there are. Should I remove them in additional commits and add them to the patch series?
Yes.
julia
Quoted 114 lines
Thanks,
Briana
Quoted 107 lines
julia
Quoted 104 lines
Signed-off-by Briana Oursler <[email protected]>--- drivers/staging/vt6655/card.c | 55 ----------------------------- ------ drivers/staging/vt6655/card.h | 1 - 2 files changed, 56 deletions(-)drivers/staging/vt6655/card.c +0
-1@@ -17,7 +17,6 @@* CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDbRadioPowerOff - Turn Off NIC Radio Power -* CARDbRadioPowerOn - Turn On NIC Radio Power * * Revision History: * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
drivers/staging/vt6655/card.c +0
-54@@ -437,60 +436,6 @@ void CARDbRadioPowerOff(struct vnt_private *priv) LED_ACTSET); /* LED issue */ } -/* -* Description: Turn on Radio power -* -* Parameters: -* In: -* priv - The adapter to be turned on -* Out: -* none -* -* Return Value: true if success; otherwise false -*/ -bool CARDbRadioPowerOn (struct vnt_private *priv) -{ -bool bResult = true; - -pr_debug ("chester power on\n" ); -if (priv->bRadioControlOff) { -if (priv->bHWRadioOff) -pr_debug ("chester bHWRadioOff\n" ); -if (priv->bRadioControlOff) -pr_debug ("chester bRadioControlOff\n" ); -return false; } - -if (!priv->bRadioOff) { -pr_debug ("chester pbRadioOff\n" ); -return true; } - -BBvExitDeepSleep (priv, priv->byLocalID); - -MACvRegBitsOn (priv->PortOffset,MAC_REG_HOSTCR ,HOSTCR_RXON ); - -switch (priv->byRFType) { -case RF_RFMD2959 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_TXPEINV ); -MACvWordRegBitsOff (priv->PortOffset,MAC_REG_SOFTPWRCTL , -SOFTPWRCTL_SWPE1 ); -break ; - -case RF_AIROHA : -case RF_AL2230S : -case RF_AIROHA7230 : -MACvWordRegBitsOn (priv->PortOffset,MAC_REG_SOFTPWRCTL , - (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); -break ; - } - - priv->bRadioOff = false; -pr_debug ("chester power on\n" ); -MACvRegBitsOff (priv->PortOffset,MAC_REG_GPIOCTL0 , -LED_ACTSET );/* LED issue */ -return bResult; -} -void
CARDvSafeResetTx(struct vnt_private *priv)
{drivers/staging/vt6655/card.c +0
-0unsigned int uu;drivers/staging/vt6655/card.h +0
-1@@ -55,7 +55,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *priv);void CARDvSafeResetTx (struct vnt_private *priv);void CARDvSafeResetRx (struct vnt_private *priv);void CARDbRadioPowerOff (struct vnt_private *priv); -bool CARDbRadioPowerOn (struct vnt_private *priv);bool CARDbSetPhyParameter (struct vnt_private *priv,u8 bb_type); bool CARDbUpdateTSF(struct vnt_private *priv, unsigned charbyRxRate,
u64 qwBSSTimestamp);
--
2.24.1
About the subject, my personal preference would be "unused functions".
"Dead" is *probably* universally understood, but mind that it's only in a few languages where the equivalent of "dead" can be a synonym for obsolete, unused, superfluous, etc. In any case, that's also fine by me.
Quoted 22 lines · On Tue, 31 Mar 2020 19:22:31 -0700 Briana Oursler <[email protected]>…
This patchset removes functions that are not called in the driver but are prototyped in
card.h. Each commit limits its scope to one function definition and related documentation in code.Functions were checked for calls using the Elixir Cross Referencer and git grep.
Per Stefano Brivio's recommendation, output of bloatometer script after changes:
add/remove: 0/3 grow/shrink: 0/0 up/down: 0/-532 (-532)
Function old new deltaCARDbSoftwareReset 10 - -10 CARDvSetLoopbackMode 14 - -14 CARDbRadioPowerOn 508 - -508Total: Before=36131, After=35599, chg -1.47%
Briana Oursler (3):
Staging: vt6655: Remove CARDbSoftwareReset definition.
Staging: vt6655: Remove CARDvSetLoopbackMode definition.
Staging: vt6655: Remove CARDbRadioPowerOn definition.
Quoted 5 lines
Changes in v3:
- Update language in patch series name at suggestions from Stefano Brivio and Julia Lawall.
- Remove references to the changelog in the cover letter. It is unrelated to this series.
Changes can be listed like you did in the cover letter, and that's fine. What I tend to do, and I think it's helpful, is to only present a small summary of the changes in the cover letter, and then add detailed information in each patch, so that one has them at hand while reviewing the single patches.
This is almost irrelevant here, because changelogs for single patches are discarded (don't hit git history) just in the way the cover letter is.
However, for some subsystems (net), where the changelog for single patches is maintained, that makes a substantial difference.
In any case, for the series,
Signature · 1 line
Stefano