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 19/22] staging: rtl8192e: Make rtl8192_QueryIsShort() static
Date: Sun, 12 Jul 2015 22:29:29 +0200 [thread overview]
Message-ID: <1436732972-30175-20-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1436732972-30175-1-git-send-email-mateusz.kulikowski@gmail.com>
Relocate function within file to avoid unnecessary fw decl.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 24 ++++++++++++------------
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 -
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index f28676b..eb919b6 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1176,6 +1176,18 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(struct net_device *dev, u8 QueueID,
return QueueSelect;
}
+static u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
+{
+ u8 tmp_Short;
+
+ tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
+ ((tcb_desc->bUseShortPreamble) ? 1 : 0);
+ if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
+ tmp_Short = 0;
+
+ return tmp_Short;
+}
+
void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
struct cb_desc *cb_desc, struct sk_buff *skb)
{
@@ -2380,18 +2392,6 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev)
return Reval;
}
-u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
-{
- u8 tmp_Short;
-
- tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
- ((tcb_desc->bUseShortPreamble) ? 1 : 0);
- if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
- tmp_Short = 0;
-
- return tmp_Short;
-}
-
void ActUpdateChannelAccessSetting(struct net_device *dev,
enum wireless_mode WirelessMode,
struct channel_access_setting *ChnlAccessSetting)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index dbe0e1c..4f1b312 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
@@ -27,7 +27,6 @@
#include "r8190P_def.h"
-u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc);
bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev);
bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev);
bool rtl8192_HalTxCheckStuck(struct net_device *dev);
--
1.8.4.1
next prev parent reply other threads:[~2015-07-12 20:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-12 20:29 [PATCH 00/22] staging: rtl8192e: Various cleanups Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 01/22] staging: rtl8192e: Remove ToLegalChannel() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 02/22] staging: rtl8192e: Remove unused defines Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 03/22] staging: rtl8192e: Remove undefs Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 04/22] staging: rtl8192e: Remove unused enums Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 05/22] staging: rtl8192e: Remove unused fields from rtllib_stats Mateusz Kulikowski
2015-07-13 12:01 ` Dan Carpenter
2015-07-12 20:29 ` [PATCH 06/22] staging: rtl8192e: Remove unused ether_header structure Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 07/22] staging: rtl8192e: Remove unused rtllib_device::freq_band Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 08/22] staging: rtl8192e: Remove DOT11D_GetMaxTxPwrInDbm() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 09/22] staging: rtl8192e: Remove read|write_nic_io_(d)word|byte() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 10/22] staging: rtl8192e: Remove DMESG macro Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 11/22] staging: rtl8192e: Remove rtl819x_process_cck_rxpathsel() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 12/22] staging: rtl8192e: probe: Remove bdma64 check Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 13/22] staging: rtl8192e: Remove rtl8192_rx_cmd() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 14/22] staging: rtl8192e: rtl_dm: Make functions static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 15/22] staging: rtl8192e: rtllib_HTProc: " Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 16/22] staging: rtl8192e: Make phy_RF8256_Config_ParaFile() static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 17/22] staging: rtl8192e: rtl_core: Make functions static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 18/22] staging: rtl8192e: r8192e_phy: " Mateusz Kulikowski
2015-07-12 20:29 ` Mateusz Kulikowski [this message]
2015-07-12 20:29 ` [PATCH 20/22] staging: rtl8192e: rtllib_tx: " Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 21/22] staging: rtl8192e: Make rtllib_rx_mgt() static Mateusz Kulikowski
2015-07-13 7:19 ` Sudip Mukherjee
2015-07-12 20:29 ` [PATCH 22/22] staging: rtl8192e: rtllib_softmac: Make functions static 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=1436732972-30175-20-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®