wifi: iwlegacy: Deadcoded functions

[PATCH 1/2] wifi: iwlegacy: Remove unused il3945_calc_db_from_ratio

Posted by linux@treblig.org 1 year, 1 month ago

From: "Dr. David Alan Gilbert" <linux@treblig.org>

The last use of il3945_calc_db_from_ratio() was removed in 2010 by
commit ed1b6e99b5e6 ("iwlwifi: remove noise reporting")
when it was still called iwl3945_calc_db_from_ratio().

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 .../net/wireless/intel/iwlegacy/3945-mac.c    | 38 -------------------
 drivers/net/wireless/intel/iwlegacy/3945.h    |  1 -
 2 files changed, 39 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
index 74fc76c00ebc..4013443698a2 100644
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -1127,44 +1127,6 @@ il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)
 	rxq->rb_stts = NULL;
 }
 
-/* Convert linear signal-to-noise ratio into dB */
-static u8 ratio2dB[100] = {
-/*	 0   1   2   3   4   5   6   7   8   9 */
-	0, 0, 6, 10, 12, 14, 16, 17, 18, 19,	/* 00 - 09 */
-	20, 21, 22, 22, 23, 23, 24, 25, 26, 26,	/* 10 - 19 */
-	26, 26, 26, 27, 27, 28, 28, 28, 29, 29,	/* 20 - 29 */
-	29, 30, 30, 30, 31, 31, 31, 31, 32, 32,	/* 30 - 39 */
-	32, 32, 32, 33, 33, 33, 33, 33, 34, 34,	/* 40 - 49 */
-	34, 34, 34, 34, 35, 35, 35, 35, 35, 35,	/* 50 - 59 */
-	36, 36, 36, 36, 36, 36, 36, 37, 37, 37,	/* 60 - 69 */
-	37, 37, 37, 37, 37, 38, 38, 38, 38, 38,	/* 70 - 79 */
-	38, 38, 38, 38, 38, 39, 39, 39, 39, 39,	/* 80 - 89 */
-	39, 39, 39, 39, 39, 40, 40, 40, 40, 40	/* 90 - 99 */
-};
-
-/* Calculates a relative dB value from a ratio of linear
- *   (i.e. not dB) signal levels.
- * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
-int
-il3945_calc_db_from_ratio(int sig_ratio)
-{
-	/* 1000:1 or higher just report as 60 dB */
-	if (sig_ratio >= 1000)
-		return 60;
-
-	/* 100:1 or higher, divide by 10 and use table,
-	 *   add 20 dB to make up for divide by 10 */
-	if (sig_ratio >= 100)
-		return 20 + (int)ratio2dB[sig_ratio / 10];
-
-	/* We shouldn't see this */
-	if (sig_ratio < 1)
-		return 0;
-
-	/* Use table for ratios 1:1 - 99:1 */
-	return (int)ratio2dB[sig_ratio];
-}
-
 /*
  * il3945_rx_handle - Main entry function for receiving responses from uCode
  *
diff --git a/drivers/net/wireless/intel/iwlegacy/3945.h b/drivers/net/wireless/intel/iwlegacy/3945.h
index ffbe11902628..fb1e33c89d0e 100644
--- a/drivers/net/wireless/intel/iwlegacy/3945.h
+++ b/drivers/net/wireless/intel/iwlegacy/3945.h
@@ -173,7 +173,6 @@ struct il3945_ibss_seq {
  * for use by iwl-*.c
  *
  *****************************************************************************/
-int il3945_calc_db_from_ratio(int sig_ratio);
 void il3945_rx_replenish(void *data);
 void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);
 unsigned int il3945_fill_beacon_frame(struct il_priv *il,
-- 
2.47.1

Re: [1/2] wifi: iwlegacy: Remove unused il3945_calc_db_from_ratio()

Posted by Kalle Valo 1 year ago

linux@treblig.org wrote:

> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> The last use of il3945_calc_db_from_ratio() was removed in 2010 by
> commit ed1b6e99b5e6 ("iwlwifi: remove noise reporting")
> when it was still called iwl3945_calc_db_from_ratio().
> 
> Remove it.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>

2 patches applied to wireless-next.git, thanks.

413859e909a4 wifi: iwlegacy: Remove unused il3945_calc_db_from_ratio()
83ed80dd25f6 wifi: iwlegacy: Remove unused il_get_single_channel_number()

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20241226011355.135417-2-linux@treblig.org/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 1/2] wifi: iwlegacy: Remove unused il3945_calc_db_from_ratio

Posted by Stanislaw Gruszka 1 year, 1 month ago

On Thu, Dec 26, 2024 at 01:13:54AM +0000, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> The last use of il3945_calc_db_from_ratio() was removed in 2010 by
> commit ed1b6e99b5e6 ("iwlwifi: remove noise reporting")
> when it was still called iwl3945_calc_db_from_ratio().
> 
> Remove it.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>

> ---
>  .../net/wireless/intel/iwlegacy/3945-mac.c    | 38 -------------------
>  drivers/net/wireless/intel/iwlegacy/3945.h    |  1 -
>  2 files changed, 39 deletions(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
> index 74fc76c00ebc..4013443698a2 100644
> --- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
> +++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
> @@ -1127,44 +1127,6 @@ il3945_rx_queue_free(struct il_priv *il, struct il_rx_queue *rxq)
>  	rxq->rb_stts = NULL;
>  }
>  
> -/* Convert linear signal-to-noise ratio into dB */
> -static u8 ratio2dB[100] = {
> -/*	 0   1   2   3   4   5   6   7   8   9 */
> -	0, 0, 6, 10, 12, 14, 16, 17, 18, 19,	/* 00 - 09 */
> -	20, 21, 22, 22, 23, 23, 24, 25, 26, 26,	/* 10 - 19 */
> -	26, 26, 26, 27, 27, 28, 28, 28, 29, 29,	/* 20 - 29 */
> -	29, 30, 30, 30, 31, 31, 31, 31, 32, 32,	/* 30 - 39 */
> -	32, 32, 32, 33, 33, 33, 33, 33, 34, 34,	/* 40 - 49 */
> -	34, 34, 34, 34, 35, 35, 35, 35, 35, 35,	/* 50 - 59 */
> -	36, 36, 36, 36, 36, 36, 36, 37, 37, 37,	/* 60 - 69 */
> -	37, 37, 37, 37, 37, 38, 38, 38, 38, 38,	/* 70 - 79 */
> -	38, 38, 38, 38, 38, 39, 39, 39, 39, 39,	/* 80 - 89 */
> -	39, 39, 39, 39, 39, 40, 40, 40, 40, 40	/* 90 - 99 */
> -};
> -
> -/* Calculates a relative dB value from a ratio of linear
> - *   (i.e. not dB) signal levels.
> - * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
> -int
> -il3945_calc_db_from_ratio(int sig_ratio)
> -{
> -	/* 1000:1 or higher just report as 60 dB */
> -	if (sig_ratio >= 1000)
> -		return 60;
> -
> -	/* 100:1 or higher, divide by 10 and use table,
> -	 *   add 20 dB to make up for divide by 10 */
> -	if (sig_ratio >= 100)
> -		return 20 + (int)ratio2dB[sig_ratio / 10];
> -
> -	/* We shouldn't see this */
> -	if (sig_ratio < 1)
> -		return 0;
> -
> -	/* Use table for ratios 1:1 - 99:1 */
> -	return (int)ratio2dB[sig_ratio];
> -}
> -
>  /*
>   * il3945_rx_handle - Main entry function for receiving responses from uCode
>   *
> diff --git a/drivers/net/wireless/intel/iwlegacy/3945.h b/drivers/net/wireless/intel/iwlegacy/3945.h
> index ffbe11902628..fb1e33c89d0e 100644
> --- a/drivers/net/wireless/intel/iwlegacy/3945.h
> +++ b/drivers/net/wireless/intel/iwlegacy/3945.h
> @@ -173,7 +173,6 @@ struct il3945_ibss_seq {
>   * for use by iwl-*.c
>   *
>   *****************************************************************************/
> -int il3945_calc_db_from_ratio(int sig_ratio);
>  void il3945_rx_replenish(void *data);
>  void il3945_rx_queue_reset(struct il_priv *il, struct il_rx_queue *rxq);
>  unsigned int il3945_fill_beacon_frame(struct il_priv *il,
> -- 
> 2.47.1
>