From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
joe@perches.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 13/13] staging: rtl8192e: Remove dead code
Date: Wed, 1 Apr 2015 00:24:38 +0200 [thread overview]
Message-ID: <1427840678-14751-14-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1427840678-14751-1-git-send-email-mateusz.kulikowski@gmail.com>
Remove commented-out code
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 3 +--
drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 7 -------
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 5 +----
drivers/staging/rtl8192e/rtllib_rx.c | 7 -------
drivers/staging/rtl8192e/rtllib_wx.c | 2 --
5 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index cb74e55..2869602 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -2195,8 +2195,7 @@ rtl8192_InitializeVariables(struct net_device *dev)
priv->rtllib->softmac_features = IEEE_SOFTMAC_SCAN |
IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
- IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE /* |
- IEEE_SOFTMAC_BEACONS*/;
+ IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE;
priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci);
diff --git a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
index 970298b..03eee3d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
@@ -888,13 +888,6 @@
#define bOFDMPHY0_End 0xcff
#define bOFDMPHY1_End 0xdff
-/*#define max debug item in each debug page
-#define bMaxItem_FPGA_PHY0 0x9
-#define bMaxItem_FPGA_PHY1 0x3
-#define bMaxItem_PHY_11B 0x16
-#define bMaxItem_OFDM_PHY0 0x29
-#define bMaxItem_OFDM_PHY1 0x0 */
-
#define bPMACControl 0x0
#define bWMACControl 0x1
#define bWNICControl 0x2
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
index 505d466..7d486e8 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
@@ -120,10 +120,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
fc = le16_to_cpu(hdr->frame_ctl);
a4_included = ((fc & (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)) ==
(RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS));
- /*
- qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
- (WLAN_FC_GET_STYPE(fc) & 0x08));
- */
+
qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
(WLAN_FC_GET_STYPE(fc) & 0x80));
aad_len = 22;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index c1418b4..fe3e7e12 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -2208,13 +2208,6 @@ static inline int rtllib_network_init(
struct rtllib_network *network,
struct rtllib_rx_stats *stats)
{
-
- /*
- network->qos_data.active = 0;
- network->qos_data.supported = 0;
- network->qos_data.param_count = 0;
- network->qos_data.old_param_count = 0;
- */
memset(&network->qos_data, 0, sizeof(struct rtllib_qos_data));
/* Pull out fixed field data */
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 64709de..6234aae 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -113,8 +113,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
/* Add frequency/channel */
iwe.cmd = SIOCGIWFREQ;
-/* iwe.u.freq.m = rtllib_frequency(network->channel, network->mode);
- iwe.u.freq.e = 3; */
iwe.u.freq.m = network->channel;
iwe.u.freq.e = 0;
iwe.u.freq.i = 0;
--
1.8.4.1
prev parent reply other threads:[~2015-03-31 22:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-31 22:24 [PATCH v2 00/13] staging: rtl8192e: checkpatch.pl cleanups Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 01/13] staging: rtl8192e: Fix UNNECESSARY_ELSE warning Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 02/13] staging: rtl8192e: Fix RETURN_VOID warnings Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 03/13] staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 04/13] staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 05/13] staging: rtl8192e: Fix LINE_CONTINUATIONS warning Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 06/13] staging: rtl8192e: Fix BRACES warning Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 07/13] staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 08/13] staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 09/13] staging: rtl8192e: Divide rtllib_rx_auth() Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 10/13] staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp() Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 11/13] staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp() Mateusz Kulikowski
2015-03-31 22:24 ` [PATCH v2 12/13] staging: rtl8192e: Comment cleanup (style/format) Mateusz Kulikowski
2015-03-31 22:24 ` Mateusz Kulikowski [this message]
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=1427840678-14751-14-git-send-email-mateusz.kulikowski@gmail.com \
--to=mateusz.kulikowski@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--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®