From: John Whitmore <johnfwhitmore@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
John Whitmore <johnfwhitmore@gmail.com>
Subject: [PATCH 16/17] staging:rtl8192u: Rename IsLegalChannel - Style
Date: Tue, 7 Aug 2018 22:12:54 +0100 [thread overview]
Message-ID: <20180807211255.29343-17-johnfwhitmore@gmail.com> (raw)
In-Reply-To: <20180807211255.29343-1-johnfwhitmore@gmail.com>
The function IsLegalChannel causes a checkpatch issue due to its use
of CamelCase naming. The function has been renamed to is_legal_channel.
This is a coding style change which should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/dot11d.c | 8 ++++----
drivers/staging/rtl8192u/ieee80211/dot11d.h | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 6 +++---
drivers/staging/rtl8192u/r819xU_phy.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
index 48911c68b7a4..a116858d151c 100644
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
@@ -136,19 +136,19 @@ void dot11d_scan_complete(struct ieee80211_device *dev)
}
EXPORT_SYMBOL(dot11d_scan_complete);
-int IsLegalChannel(struct ieee80211_device *dev, u8 channel)
+int is_legal_channel(struct ieee80211_device *dev, u8 channel)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
if (channel > MAX_CHANNEL_NUMBER) {
- netdev_err(dev->dev, "IsLegalChannel(): Invalid Channel\n");
+ netdev_err(dev->dev, "is_legal_channel(): Invalid Channel\n");
return 0;
}
if (pDot11dInfo->channel_map[channel] > 0)
return 1;
return 0;
}
-EXPORT_SYMBOL(IsLegalChannel);
+EXPORT_SYMBOL(is_legal_channel);
int ToLegalChannel(struct ieee80211_device *dev, u8 channel)
{
@@ -164,7 +164,7 @@ int ToLegalChannel(struct ieee80211_device *dev, u8 channel)
}
if (channel > MAX_CHANNEL_NUMBER) {
- netdev_err(dev->dev, "IsLegalChannel(): Invalid Channel\n");
+ netdev_err(dev->dev, "is_legal_channel(): Invalid Channel\n");
return default_chn;
}
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h
index d52ddad1cd42..e792aaa9995c 100644
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.h
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h
@@ -57,7 +57,7 @@ void dot11d_update_country_ie(struct ieee80211_device *dev,
u8 *coutry_ie);
u8 dot11d_get_max_tx_pwr_in_dbm(struct ieee80211_device *dev, u8 channel);
void dot11d_scan_complete(struct ieee80211_device *dev);
-int IsLegalChannel(struct ieee80211_device *dev, u8 channel);
+int is_legal_channel(struct ieee80211_device *dev, u8 channel);
int ToLegalChannel(struct ieee80211_device *dev, u8 channel);
#endif /* #ifndef __INC_DOT11D_H */
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 2ceead4aebad..d6e56b823f83 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -2439,7 +2439,7 @@ static inline void ieee80211_process_probe_response(
// then wireless adapter should do active scan from ch1~11 and
// passive scan from ch12~14
- if (!IsLegalChannel(ieee, network->channel))
+ if (!is_legal_channel(ieee, network->channel))
goto out;
if (ieee->bGlobalDomain)
{
@@ -2448,7 +2448,7 @@ static inline void ieee80211_process_probe_response(
// Case 1: Country code
if(IS_COUNTRY_IE_VALID(ieee) )
{
- if (!IsLegalChannel(ieee, network->channel)) {
+ if (!is_legal_channel(ieee, network->channel)) {
printk("GetScanInfo(): For Country code, filter probe response at channel(%d).\n", network->channel);
goto out;
}
@@ -2469,7 +2469,7 @@ static inline void ieee80211_process_probe_response(
// Case 1: Country code
if(IS_COUNTRY_IE_VALID(ieee) )
{
- if (!IsLegalChannel(ieee, network->channel)) {
+ if (!is_legal_channel(ieee, network->channel)) {
printk("GetScanInfo(): For Country code, filter beacon at channel(%d).\n",network->channel);
goto out;
}
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index 7ee10d49894b..0a13a1f8a14d 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -1271,7 +1271,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
RT_TRACE(COMP_CH, "%s() stage: %d, step: %d, channel: %d\n",
__func__, *stage, *step, channel);
- if (!IsLegalChannel(priv->ieee80211, channel)) {
+ if (!is_legal_channel(priv->ieee80211, channel)) {
RT_TRACE(COMP_ERR, "set to illegal channel: %d\n", channel);
/* return true to tell upper caller function this channel
* setting is finished! Or it will in while loop.
--
2.18.0
next prev parent reply other threads:[~2018-08-07 21:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 21:12 [PATCH 00/17] staging:rtl8192u: Coding style changes John Whitmore
2018-08-07 21:12 ` [PATCH 01/17] staging:rtl8192u: Remove stale comment - Style John Whitmore
2018-08-07 21:12 ` [PATCH 02/17] staging:rtl8192u: Add spaces around '+' operator " John Whitmore
2018-08-07 21:12 ` [PATCH 03/17] staging:rtl8192u: Remove unused macro definitions " John Whitmore
2018-08-07 21:12 ` [PATCH 04/17] staging:rtl8192u: Rename eqMacAddr macro " John Whitmore
2018-08-08 8:12 ` Joe Perches
2018-08-08 8:52 ` John Whitmore
2018-08-07 21:12 ` [PATCH 05/17] staging:rtl8192u: Rename cpMacAddr Macro " John Whitmore
2018-08-08 8:14 ` Joe Perches
2018-08-07 21:12 ` [PATCH 06/17] staging:rtl8192u: Rename macro parameter __pIeeeDev " John Whitmore
2018-08-07 21:12 ` [PATCH 07/17] staging:rtl8192u: Rename __pTa " John Whitmore
2018-08-07 21:12 ` [PATCH 08/17] staging:rtl8192u: Lines should not end with a '(' " John Whitmore
2018-08-07 21:12 ` [PATCH 09/17] staging:rtl8192u: Rename Dot11d_Init " John Whitmore
2018-08-07 21:12 ` [PATCH 10/17] staging:rtl8192u: Rename Dot11d_Reset " John Whitmore
2018-08-07 21:12 ` [PATCH 11/17] staging:rtl8192u: Rename Dot11d_UpdateCountryIe " John Whitmore
2018-08-07 21:12 ` [PATCH 12/17] staging:rtl8192u: Rename dot11d_update_country_ie() parameters " John Whitmore
2018-08-07 21:12 ` [PATCH 13/17] staging:rtl8192u: Rename DOT11D_GetMaxTxPwrInDbm " John Whitmore
2018-08-07 21:12 ` [PATCH 14/17] staging:rtl8192u: Rename Channel " John Whitmore
2018-08-07 21:12 ` [PATCH 15/17] staging:rtl8192u: Rename DOT11D_ScanComplete " John Whitmore
2018-08-07 21:12 ` John Whitmore [this message]
2018-08-07 21:12 ` [PATCH 17/17] staging:rtl8192u: Rename ToLegalChannel " John Whitmore
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=20180807211255.29343-17-johnfwhitmore@gmail.com \
--to=johnfwhitmore@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