[PATCH] net: wireless: rtlwifi: rtl8192ee: trx.c: Remove unused function

[PATCH] net: wireless: rtlwifi: rtl8192ee: trx.c: Remove unused function

[Rickard Strandqvist]

Remove the function rtl92ee_get_available_desc() that is not used anywhere.

This was partially found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 drivers/net/wireless/rtlwifi/rtl8192ee/trx.c |   21 ---------------------
 drivers/net/wireless/rtlwifi/rtl8192ee/trx.h |    1 -
 2 files changed, 22 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
index 2fcbef1..8186ed2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
@@ -710,27 +710,6 @@ static u16 get_desc_addr_fr_q_idx(u16 queue_index)
 	return desc_address;
 }
 
-void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
-{
-	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	u16 point_diff = 0;
-	u16 current_tx_read_point = 0, current_tx_write_point = 0;
-	u32 tmp_4byte;
-
-	tmp_4byte = rtl_read_dword(rtlpriv,
-				   get_desc_addr_fr_q_idx(q_idx));
-	current_tx_read_point = (u16)((tmp_4byte >> 16) & 0x0fff);
-	current_tx_write_point = (u16)((tmp_4byte) & 0x0fff);
-
-	point_diff = ((current_tx_read_point > current_tx_write_point) ?
-		      (current_tx_read_point - current_tx_write_point) :
-		      (TX_DESC_NUM_92E - current_tx_write_point +
-		       current_tx_read_point));
-
-	rtlpci->tx_ring[q_idx].avl_desc = point_diff;
-}
-
 void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
 				 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
 				 struct sk_buff *skb, dma_addr_t addr)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
index 6f9be1c..4426c49 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
@@ -829,7 +829,6 @@ void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
 			     u8 queue_index);
 u16	rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw,
 					  u8 queue_index);
-void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
 void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
 				 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
 				 struct sk_buff *skb, dma_addr_t addr);
-- 
1.7.10.4

Re: [PATCH] net: wireless: rtlwifi: rtl8192ee: trx.c: Remove unused function

[Larry Finger]

On 12/20/2014 06:48 AM, Rickard Strandqvist wrote:
> Remove the function rtl92ee_get_available_desc() that is not used anywhere.
>
> This was partially found by using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
>   drivers/net/wireless/rtlwifi/rtl8192ee/trx.c |   21 ---------------------
>   drivers/net/wireless/rtlwifi/rtl8192ee/trx.h |    1 -
>   2 files changed, 22 deletions(-)

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Richard: FYI, John Linville stepped down as wireless maintainer this week, thus 
there is no need to send patches to him anymore. Kalle Valo, the new maintainer, 
has stated that it is not necessary to Cc him.

Larry

>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
> index 2fcbef1..8186ed2 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
> @@ -710,27 +710,6 @@ static u16 get_desc_addr_fr_q_idx(u16 queue_index)
>   	return desc_address;
>   }
>
> -void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
> -{
> -	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
> -	struct rtl_priv *rtlpriv = rtl_priv(hw);
> -	u16 point_diff = 0;
> -	u16 current_tx_read_point = 0, current_tx_write_point = 0;
> -	u32 tmp_4byte;
> -
> -	tmp_4byte = rtl_read_dword(rtlpriv,
> -				   get_desc_addr_fr_q_idx(q_idx));
> -	current_tx_read_point = (u16)((tmp_4byte >> 16) & 0x0fff);
> -	current_tx_write_point = (u16)((tmp_4byte) & 0x0fff);
> -
> -	point_diff = ((current_tx_read_point > current_tx_write_point) ?
> -		      (current_tx_read_point - current_tx_write_point) :
> -		      (TX_DESC_NUM_92E - current_tx_write_point +
> -		       current_tx_read_point));
> -
> -	rtlpci->tx_ring[q_idx].avl_desc = point_diff;
> -}
> -
>   void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
>   				 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
>   				 struct sk_buff *skb, dma_addr_t addr)
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
> index 6f9be1c..4426c49 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
> @@ -829,7 +829,6 @@ void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
>   			     u8 queue_index);
>   u16	rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw,
>   					  u8 queue_index);
> -void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
>   void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
>   				 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
>   				 struct sk_buff *skb, dma_addr_t addr);
>

Re: [PATCH] net: wireless: rtlwifi: rtl8192ee: trx.c: Remove unused function

[Kalle Valo]

Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:

> Remove the function rtl92ee_get_available_desc() that is not used anywhere.
>
> This was partially found by using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>

Thanks, applied to wireless-drivers-next.git.

But I simplified the patch title:

commit 9898b77536b8569be2704964d3c519ef070e4a27
Author: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Date:   Sat Dec 20 13:48:14 2014 +0100

    rtlwifi: rtl8192ee: trx.c: Remove unused function

-- 
Kalle Valo