mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 10/16] staging: rtl8192e: Remove rtllib_device::get_nic_desc_num()
Date: Mon, 15 Jun 2015 00:58:54 +0200	[thread overview]
Message-ID: <1434322740-14454-11-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1434322740-14454-1-git-send-email-mateusz.kulikowski@gmail.com>

This function/callback was initialized and never called.
rtl8192_get_nic_desc_num() function that was default
implementation was also removed.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 17 -----------------
 drivers/staging/rtl8192e/rtllib.h            |  1 -
 2 files changed, 18 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 4c53c87..71289ca 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -440,22 +440,6 @@ bool MgntActSet_RF_State(struct net_device *dev,
 	return bActionAllowed;
 }
 
-
-static short rtl8192_get_nic_desc_num(struct net_device *dev, int prio)
-{
-	struct r8192_priv *priv = rtllib_priv(dev);
-	struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
-
-	/* For now, we reserved two free descriptor as a safety boundary
-	* between the tail and the head
-	*/
-	if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10))
-		RT_TRACE(COMP_DBG,
-			 "-----[%d]---------ring->idx=%d queue_len=%d---------\n",
-			 prio, ring->idx, skb_queue_len(&ring->queue));
-	return skb_queue_len(&ring->queue);
-}
-
 static short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio)
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
@@ -1046,7 +1030,6 @@ static void rtl8192_init_priv_handler(struct net_device *dev)
 	priv->rtllib->data_hard_stop		= rtl8192_data_hard_stop;
 	priv->rtllib->data_hard_resume		= rtl8192_data_hard_resume;
 	priv->rtllib->check_nic_enough_desc	= rtl8192_check_nic_enough_desc;
-	priv->rtllib->get_nic_desc_num		= rtl8192_get_nic_desc_num;
 	priv->rtllib->handle_assoc_response	= rtl8192_handle_assoc_response;
 	priv->rtllib->handle_beacon		= rtl8192_handle_beacon;
 	priv->rtllib->SetWirelessMode		= rtl8192_SetWirelessMode;
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 6d6e637..22cbd45 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1952,7 +1952,6 @@ struct rtllib_device {
 
 	/* check whether Tx hw resource available */
 	short (*check_nic_enough_desc)(struct net_device *dev, int queue_index);
-	short (*get_nic_desc_num)(struct net_device *dev, int queue_index);
 	void (*SetBWModeHandler)(struct net_device *dev,
 				 enum ht_channel_width Bandwidth,
 				 enum ht_extchnl_offset Offset);
-- 
1.8.4.1


  parent reply	other threads:[~2015-06-14 23:02 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-14 22:58 [PATCH 00/16] staging: rtl8192e: Remove unused code Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 01/16] staging: rtl8192e: Remove unused code in rtl819x_HT.h Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 02/16] staging: rtl8192e: Remove unused code in rtllib.h Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 03/16] staging: rtl8192e: Remove rt_hi_throughput::ChnkOp Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 04/16] staging: rtl8192e: Remove ENABLE_LOCK_DEBUG reference Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 05/16] staging: rtl8192e: Remove rtllib_stop_queue() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 06/16] staging: rtl8192e: Remove rtllib_wake_queue() Mateusz Kulikowski
2015-06-15  6:38   ` Sudip Mukherjee
2015-06-15  6:41     ` Mateusz Kulikowski
2015-06-15  6:52       ` Sudip Mukherjee
2015-06-15  6:55         ` Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 07/16] staging: rtl8192e: Remove dequeue_mgmt() and rtllib_resume_tx() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 08/16] staging: rtl8192e: Remove rtllib_is_shortslot() Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 09/16] staging: rtl8192e: Remove rtllib_wx_get_encode_ext() Mateusz Kulikowski
2015-06-14 22:58 ` Mateusz Kulikowski [this message]
2015-06-14 22:58 ` [PATCH 11/16] staging: rtl8192e: Remove WIRELESS_EXT checks Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 12/16] staging: rtl8192e: Remove rtllib_network::last_associate Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 13/16] staging: rtl8192e: Remove rt_pwr_save_ctrl members Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 14/16] staging: rtl8192e: Remove unused rtllib_device members Mateusz Kulikowski
2015-06-14 22:58 ` [PATCH 15/16] staging: rtl8192e: Remove softmac_hint11d_wq queue Mateusz Kulikowski
2015-06-14 22:59 ` [PATCH 16/16] staging: rtl8192e: Remove rtllib_device::agregation Mateusz Kulikowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434322740-14454-11-git-send-email-mateusz.kulikowski@gmail.com \
    --to=mateusz.kulikowski@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®