staging:rtl8192u: Rename member pDot11dInfo - Style

Rename 'pDot11dInfo', this member variable of the structure
ieee80211_device causes a checkpatch issue, CamelCase naming. The
member has been renamed 'dot11d_info' to clear this issue.

This is a coding style change which should have no impact on runtime
code execution.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
index 19015394ad6632c13ba3521bace03c9a9b7614ca..130ddfe9868f6a410c66af2f49f5f2a61553c096 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.c
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c
@@ -5,14 +5,14 @@
 
 void rtl8192u_dot11d_init(struct ieee80211_device *ieee)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
 
-       pDot11dInfo->dot11d_enabled = false;
+       dot11d_info->dot11d_enabled = false;
 
-       pDot11dInfo->state = DOT11D_STATE_NONE;
-       pDot11dInfo->country_ie_len = 0;
-       memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
-       memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
+       dot11d_info->state = DOT11D_STATE_NONE;
+       dot11d_info->country_ie_len = 0;
+       memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+       memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
        RESET_CIE_WATCHDOG(ieee);
 
        netdev_info(ieee->dev, "rtl8192u_dot11d_init()\n");
@@ -23,19 +23,19 @@ EXPORT_SYMBOL(rtl8192u_dot11d_init);
 void dot11d_reset(struct ieee80211_device *ieee)
 {
        u32 i;
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
        /* Clear old channel map */
-       memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
-       memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
+       memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER+1);
+       memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
        /* Set new channel map */
        for (i = 1; i <= 11; i++)
-               (pDot11dInfo->channel_map)[i] = 1;
+               (dot11d_info->channel_map)[i] = 1;
 
        for (i = 12; i <= 14; i++)
-               (pDot11dInfo->channel_map)[i] = 2;
+               (dot11d_info->channel_map)[i] = 2;
 
-       pDot11dInfo->state = DOT11D_STATE_NONE;
-       pDot11dInfo->country_ie_len = 0;
+       dot11d_info->state = DOT11D_STATE_NONE;
+       dot11d_info->country_ie_len = 0;
        RESET_CIE_WATCHDOG(ieee);
 }
 EXPORT_SYMBOL(dot11d_reset);
@@ -52,12 +52,12 @@ EXPORT_SYMBOL(dot11d_reset);
 void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,
                            u16 CoutryIeLen, u8 *pCoutryIe)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
        u8 i, j, NumTriples, MaxChnlNum;
        struct chnl_txpower_triple *pTriple;
 
-       memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
-       memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
+       memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER+1);
+       memset(dot11d_info->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
        MaxChnlNum = 0;
        NumTriples = (CoutryIeLen - 3) / 3; /* skip 3-byte country string. */
        pTriple = (struct chnl_txpower_triple *)(pCoutryIe + 3);
@@ -78,8 +78,8 @@ void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,
                }
 
                for (j = 0; j < pTriple->num_channels; j++) {
-                       pDot11dInfo->channel_map[pTriple->first_channel + j] = 1;
-                       pDot11dInfo->max_tx_pwr_dbm_list[pTriple->first_channel + j] = pTriple->max_tx_pwr_dbm;
+                       dot11d_info->channel_map[pTriple->first_channel + j] = 1;
+                       dot11d_info->max_tx_pwr_dbm_list[pTriple->first_channel + j] = pTriple->max_tx_pwr_dbm;
                        MaxChnlNum = pTriple->first_channel + j;
                }
 
@@ -87,29 +87,29 @@ void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,
        }
        netdev_info(dev->dev, "Channel List:");
        for (i = 1; i <= MAX_CHANNEL_NUMBER; i++)
-               if (pDot11dInfo->channel_map[i] > 0)
+               if (dot11d_info->channel_map[i] > 0)
                        netdev_info(dev->dev, " %d", i);
        netdev_info(dev->dev, "\n");
 
        UPDATE_CIE_SRC(dev, pTaddr);
 
-       pDot11dInfo->country_ie_len = CoutryIeLen;
-       memcpy(pDot11dInfo->country_ie_buf, pCoutryIe, CoutryIeLen);
-       pDot11dInfo->state = DOT11D_STATE_LEARNED;
+       dot11d_info->country_ie_len = CoutryIeLen;
+       memcpy(dot11d_info->country_ie_buf, pCoutryIe, CoutryIeLen);
+       dot11d_info->state = DOT11D_STATE_LEARNED;
 }
 EXPORT_SYMBOL(dot11d_update_country_ie);
 
 u8 dot11d_get_max_tx_pwr_in_dbm(struct ieee80211_device *dev, u8 Channel)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
        u8 MaxTxPwrInDbm = 255;
 
        if (Channel > MAX_CHANNEL_NUMBER) {
                netdev_err(dev->dev, "dot11d_get_max_tx_pwr_in_dbm(): Invalid Channel\n");
                return MaxTxPwrInDbm;
        }
-       if (pDot11dInfo->channel_map[Channel])
-               MaxTxPwrInDbm = pDot11dInfo->max_tx_pwr_dbm_list[Channel];
+       if (dot11d_info->channel_map[Channel])
+               MaxTxPwrInDbm = dot11d_info->max_tx_pwr_dbm_list[Channel];
 
        return MaxTxPwrInDbm;
 }
@@ -117,11 +117,11 @@ EXPORT_SYMBOL(dot11d_get_max_tx_pwr_in_dbm);
 
 void dot11d_scan_complete(struct ieee80211_device *dev)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
 
-       switch (pDot11dInfo->state) {
+       switch (dot11d_info->state) {
        case DOT11D_STATE_LEARNED:
-               pDot11dInfo->state = DOT11D_STATE_DONE;
+               dot11d_info->state = DOT11D_STATE_DONE;
                break;
 
        case DOT11D_STATE_DONE:
@@ -138,13 +138,13 @@ EXPORT_SYMBOL(dot11d_scan_complete);
 
 int is_legal_channel(struct ieee80211_device *dev, u8 channel)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
 
        if (channel > MAX_CHANNEL_NUMBER) {
                netdev_err(dev->dev, "is_legal_channel(): Invalid Channel\n");
                return 0;
        }
-       if (pDot11dInfo->channel_map[channel] > 0)
+       if (dot11d_info->channel_map[channel] > 0)
                return 1;
        return 0;
 }
@@ -152,12 +152,12 @@ EXPORT_SYMBOL(is_legal_channel);
 
 int to_legal_channel(struct ieee80211_device *dev, u8 channel)
 {
-       struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+       struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
        u8 default_chn = 0;
        u32 i = 0;
 
        for (i = 1; i <= MAX_CHANNEL_NUMBER; i++) {
-               if (pDot11dInfo->channel_map[i] > 0) {
+               if (dot11d_info->channel_map[i] > 0) {
                        default_chn = i;
                        break;
                }
@@ -168,7 +168,7 @@ int to_legal_channel(struct ieee80211_device *dev, u8 channel)
                return default_chn;
        }
 
-       if (pDot11dInfo->channel_map[channel] > 0)
+       if (dot11d_info->channel_map[channel] > 0)
                return channel;
 
        return default_chn;

diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h
index cd312b51b549b5542f5fa22d5e3875d80eebc532..8b485fa180898e127da49015d96a31417fb81809 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/dot11d.h
+++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h
@@ -31,7 +31,7 @@ struct rt_dot11d_info {
        u8  dot11d_enabled; /* dot11MultiDomainCapabilityEnabled */
 };
 
-#define GET_DOT11D_INFO(ieee_dev) ((struct rt_dot11d_info *)((ieee_dev)->pDot11dInfo))
+#define GET_DOT11D_INFO(ieee_dev) ((struct rt_dot11d_info *)((ieee_dev)->dot11d_info))
 
 #define IS_DOT11D_ENABLE(ieee_dev) (GET_DOT11D_INFO(ieee_dev)->dot11d_enabled)
 #define IS_COUNTRY_IE_VALID(ieee_dev) (GET_DOT11D_INFO(ieee_dev)->country_ie_len > 0)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index e2e503d24c4c2415497cdc68e32bfec55d5e665f..b4e7ae60ac1c25eecd740f8e77f9c58f7891a3fb 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1772,7 +1772,7 @@ struct ieee80211_device {
 
        /* map of allowed channels. 0 is dummy */
        // FIXME: remember to default to a basic channel plan depending of the PHY type
-       void *pDot11dInfo;
+       void *dot11d_info;
        bool bGlobalDomain;
        int rate;       /* current rate */
        int basic_rate;

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index a20c79401dab74a2bcd20b7cba4df6681c29dcbe..8635faf84316880297b10d9cbc7e4f7b5f106e7b 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -2542,8 +2542,8 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
        for (i = 0; i < 5; i++)
                ieee->seq_ctrl[i] = 0;
 
-       ieee->pDot11dInfo = kzalloc(sizeof(struct rt_dot11d_info), GFP_KERNEL);
-       if (!ieee->pDot11dInfo)
+       ieee->dot11d_info = kzalloc(sizeof(struct rt_dot11d_info), GFP_KERNEL);
+       if (!ieee->dot11d_info)
                IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't alloc memory for DOT11D\n");
        //added for  AP roaming
        ieee->LinkDetectInfo.SlotNum = 2;
@@ -2603,8 +2603,8 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee)
 void ieee80211_softmac_free(struct ieee80211_device *ieee)
 {
        mutex_lock(&ieee->wx_mutex);
-       kfree(ieee->pDot11dInfo);
-       ieee->pDot11dInfo = NULL;
+       kfree(ieee->dot11d_info);
+       ieee->dot11d_info = NULL;
        del_timer_sync(&ieee->associate_timer);
 
        cancel_delayed_work(&ieee->associate_retry_wq);