[Patch v4 0/4] Staging: vt6655: Remove unused functions.

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Patch v4 0/4] Staging: vt6655: Remove unused functions.
@ 2020-04-02  5:14 Briana Oursler
  2020-04-02  5:14 ` [Patch v4 1/4] Staging: vt6655: Remove CARDbSoftwareReset definition Briana Oursler
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Briana Oursler @ 2020-04-02  5:14 UTC (permalink / raw)
  To: sbrivio, gregkh, julia.lawall, forest, outreachy-kernel; +Cc: Briana Oursler

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/4 grow/shrink: 0/0 up/down: 0/-572 (-572)
Function                                     old     new   delta
CARDbSoftwareReset                            10       -     -10
CARDvSetLoopbackMode                          14       -     -14
BBvExitDeepSleep                              40       -     -40
CARDbRadioPowerOn                            508       -    -508
Total: Before=36131, After=35559, chg -1.58%

Briana Oursler (4):
  Staging: vt6655: Remove CARDbSoftwareReset definition.
  Staging: vt6655: Remove CARDvSetLoopbackMode definition.
  Staging: vt6655: Remove CARDbRadioPowerOn definition.
  Staging: vt6655: Remove BBvExitDeepSleep definition.

Changes in v4:
	- Update patch series title.
	- Add patch 4/4 per suggestion of Julia Lawall.
	- Patches 1/4-3/4 unchanged.

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 description within the series.

 drivers/staging/vt6655/baseband.c |   6 --
 drivers/staging/vt6655/baseband.h |   1 -
 drivers/staging/vt6655/card.c     | 105 ------------------------------
 drivers/staging/vt6655/card.h     |   4 --
 4 files changed, 116 deletions(-)

-- 
2.24.1



^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Patch v4 1/4] Staging: vt6655: Remove CARDbSoftwareReset definition.
  2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
@ 2020-04-02  5:14 ` Briana Oursler
  2020-04-02  5:14 ` [Patch v4 2/4] Staging: vt6655: Remove CARDvSetLoopbackMode definition Briana Oursler
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Briana Oursler @ 2020-04-02  5:14 UTC (permalink / raw)
  To: sbrivio, gregkh, julia.lawall, forest, outreachy-kernel; +Cc: Briana Oursler

Remove function CARDbSoftwareReset that is never called, along with
comments related to it.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
---

Changes in v2:
	- Remove extra newline that was introduced after function call,
	  change recommended by Stefano Brivio.

 drivers/staging/vt6655/card.c | 21 ---------------------
 drivers/staging/vt6655/card.h |  1 -
 2 files changed, 22 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index e65c9825ea5a..52af85fe538d 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -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
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 337266add6b2..a811ac8942a0 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -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,
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Patch v4 2/4] Staging: vt6655: Remove CARDvSetLoopbackMode definition.
  2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
  2020-04-02  5:14 ` [Patch v4 1/4] Staging: vt6655: Remove CARDbSoftwareReset definition Briana Oursler
@ 2020-04-02  5:14 ` Briana Oursler
  2020-04-02  5:14 ` [Patch v4 3/4] Staging: vt6655: Remove CARDbRadioPowerOn definition Briana Oursler
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Briana Oursler @ 2020-04-02  5:14 UTC (permalink / raw)
  To: sbrivio, gregkh, julia.lawall, forest, outreachy-kernel; +Cc: Briana Oursler

Remove function CARDvSetLoopbackMode that is never called, along with
comments related to it.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
---
 drivers/staging/vt6655/card.c | 29 -----------------------------
 drivers/staging/vt6655/card.h |  2 --
 2 files changed, 31 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 52af85fe538d..222b6ef61d9c 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -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
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index a811ac8942a0..32405027e269 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -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,
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Patch v4 3/4] Staging: vt6655: Remove CARDbRadioPowerOn definition.
  2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
  2020-04-02  5:14 ` [Patch v4 1/4] Staging: vt6655: Remove CARDbSoftwareReset definition Briana Oursler
  2020-04-02  5:14 ` [Patch v4 2/4] Staging: vt6655: Remove CARDvSetLoopbackMode definition Briana Oursler
@ 2020-04-02  5:14 ` Briana Oursler
  2020-04-02  5:14 ` [Patch v4 4/4] Staging: vt6655: Remove BBvExitDeepSleep definition Briana Oursler
  2020-04-03  0:03 ` [Outreachy kernel] [Patch v4 0/4] Staging: vt6655: Remove unused functions Stefano Brivio
  4 siblings, 0 replies; 6+ messages in thread
From: Briana Oursler @ 2020-04-02  5:14 UTC (permalink / raw)
  To: sbrivio, gregkh, julia.lawall, forest, outreachy-kernel; +Cc: Briana Oursler

Remove function CARDbRadioPowerOn that is never called, along with
comments related to it.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
---
 drivers/staging/vt6655/card.c | 55 -----------------------------------
 drivers/staging/vt6655/card.h |  1 -
 2 files changed, 56 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 222b6ef61d9c..67b23ab0b0d1 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -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;
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 32405027e269..568a2ddd6588 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Patch v4 4/4] Staging: vt6655: Remove BBvExitDeepSleep definition.
  2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
                   ` (2 preceding siblings ...)
  2020-04-02  5:14 ` [Patch v4 3/4] Staging: vt6655: Remove CARDbRadioPowerOn definition Briana Oursler
@ 2020-04-02  5:14 ` Briana Oursler
  2020-04-03  0:03 ` [Outreachy kernel] [Patch v4 0/4] Staging: vt6655: Remove unused functions Stefano Brivio
  4 siblings, 0 replies; 6+ messages in thread
From: Briana Oursler @ 2020-04-02  5:14 UTC (permalink / raw)
  To: sbrivio, gregkh, julia.lawall, forest, outreachy-kernel; +Cc: Briana Oursler

Remove function BBvExitDeepSleep that is never called.

Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
---
Changes in v4:
	- BBvExitDeepSleep was called by CardbRadioPowerOn(), an unused
	  function in the driver removed in patch 3/3. Check recommended
	  by Julia Lawall.

 drivers/staging/vt6655/baseband.c | 6 ------
 drivers/staging/vt6655/baseband.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index b4cdc0b7fee7..b6d4a435edde 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -2384,9 +2384,3 @@ BBvSetDeepSleep(struct vnt_private *priv, unsigned char byLocalID)
 	BBbWriteEmbedded(priv, 0x0D, 0xB9); /* CR13 */
 }
 
-void
-BBvExitDeepSleep(struct vnt_private *priv, unsigned char byLocalID)
-{
-	BBbWriteEmbedded(priv, 0x0C, 0x00); /* CR12 */
-	BBbWriteEmbedded(priv, 0x0D, 0x01); /* CR13 */
-}
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index 0cc2e07829c5..8b738c6afe00 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -70,6 +70,5 @@ void BBvPowerSaveModeOFF(struct vnt_private *priv);
 void BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode);
 void BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode);
 void BBvSetDeepSleep(struct vnt_private *priv, unsigned char byLocalID);
-void BBvExitDeepSleep(struct vnt_private *priv, unsigned char byLocalID);
 
 #endif /* __BASEBAND_H__ */
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Outreachy kernel] [Patch v4 0/4] Staging: vt6655: Remove unused functions.
  2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
                   ` (3 preceding siblings ...)
  2020-04-02  5:14 ` [Patch v4 4/4] Staging: vt6655: Remove BBvExitDeepSleep definition Briana Oursler
@ 2020-04-03  0:03 ` Stefano Brivio
  4 siblings, 0 replies; 6+ messages in thread
From: Stefano Brivio @ 2020-04-03  0:03 UTC (permalink / raw)
  To: Briana Oursler; +Cc: gregkh, julia.lawall, forest, outreachy-kernel

On Wed,  1 Apr 2020 22:14:32 -0700
Briana Oursler <briana.oursler@gmail.com> wrote:

> 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/4 grow/shrink: 0/0 up/down: 0/-572 (-572)
> Function                                     old     new   delta
> CARDbSoftwareReset                            10       -     -10
> CARDvSetLoopbackMode                          14       -     -14
> BBvExitDeepSleep                              40       -     -40
> CARDbRadioPowerOn                            508       -    -508
> Total: Before=36131, After=35559, chg -1.58%
> 
> Briana Oursler (4):
>   Staging: vt6655: Remove CARDbSoftwareReset definition.
>   Staging: vt6655: Remove CARDvSetLoopbackMode definition.
>   Staging: vt6655: Remove CARDbRadioPowerOn definition.
>   Staging: vt6655: Remove BBvExitDeepSleep definition.

For the series,

Reviewed-by: Stefano Brivio <sbrivio@redhat.com>

-- 
Stefano



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-04-03  0:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-02  5:14 [Patch v4 0/4] Staging: vt6655: Remove unused functions Briana Oursler
2020-04-02  5:14 ` [Patch v4 1/4] Staging: vt6655: Remove CARDbSoftwareReset definition Briana Oursler
2020-04-02  5:14 ` [Patch v4 2/4] Staging: vt6655: Remove CARDvSetLoopbackMode definition Briana Oursler
2020-04-02  5:14 ` [Patch v4 3/4] Staging: vt6655: Remove CARDbRadioPowerOn definition Briana Oursler
2020-04-02  5:14 ` [Patch v4 4/4] Staging: vt6655: Remove BBvExitDeepSleep definition Briana Oursler
2020-04-03  0:03 ` [Outreachy kernel] [Patch v4 0/4] Staging: vt6655: Remove unused functions Stefano Brivio

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.