[v2] staging: r8188eu: remove unused ijk_matrix_regs_set implementation

Message ID Y2P6Jj+IcPss0wFd@qemulion
State New
Headers
Series [v2] staging: r8188eu: remove unused ijk_matrix_regs_set implementation |

Commit Message

Deepak R Varma Nov. 3, 2022, 5:28 p.m. UTC
  Instance IQKMatrixRegSetting of struct ijk_matrix_regs_set is
initialised and its member variables are assigned values, but it is
not used anywhere. Remove the structure and its unused implementation.

Suggested-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Deepak R Varma <drv@mailo.com>
---

Changes in v2:
   1. Instead of converting 2D array to 1D, remove the associated implementation
      since it is not used anywhere in the code.
      Feedback by gregkh@linuxfoundation.org
   2. Just for reference, the patch subject in v1 was:
      "staging: r8188eu: replace one element 2D array by 1D array"


 drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 8 --------
 drivers/staging/r8188eu/include/odm.h        | 7 -------
 2 files changed, 15 deletions(-)

--
2.34.1
  

Patch

diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
index 622f95d3f2ed..26e710ef5134 100644
--- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
@@ -882,14 +882,6 @@  void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)
 	if (RegE94 != 0)
 		patha_fill_iqk(adapt, pathaok, result, final_candidate, (RegEA4 == 0));

-/* To Fix BSOD when final_candidate is 0xff */
-/* by sherry 20120321 */
-	if (final_candidate < 4) {
-		for (i = 0; i < IQK_Matrix_REG_NUM; i++)
-			dm_odm->RFCalibrateInfo.IQKMatrixRegSetting.Value[0][i] = result[final_candidate][i];
-		dm_odm->RFCalibrateInfo.IQKMatrixRegSetting.bIQKDone = true;
-	}
-
 	_PHY_SaveADDARegisters(adapt, IQK_BB_REG_92C, dm_odm->RFCalibrateInfo.IQK_BB_backup_recover, 9);
 }

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 89b01dd614ba..8cea166b7b73 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -80,7 +80,6 @@  struct odm_rate_adapt {
 #define HP_THERMAL_NUM		8

 #define AVG_THERMAL_NUM		8
-#define IQK_Matrix_REG_NUM	8

 struct odm_phy_dbg_info {
 	/* ODM Write,debug info */
@@ -164,11 +163,6 @@  struct odm_ra_info {
 	u8 PTSmoothFactor;
 };

-struct ijk_matrix_regs_set {
-	bool	bIQKDone;
-	s32	Value[1][IQK_Matrix_REG_NUM];
-};
-
 struct odm_rf_cal {
 	/* for tx power tracking */
 	u32	RegA24; /*  for TempCCK */
@@ -206,7 +200,6 @@  struct odm_rf_cal {

 	u8	ThermalValue_HP[HP_THERMAL_NUM];
 	u8	ThermalValue_HP_index;
-	struct ijk_matrix_regs_set IQKMatrixRegSetting;

 	u8	Delta_IQK;
 	u8	Delta_LCK;