staging: wlan-ng: rename DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLeve...

Rename DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel
in p80211metadef.h to DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL
to fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines. Also shorten name by removing repeated use of
"DOT11" and "DOT11PHY" to ease readability and reduce long lines.

Signed-off-by: Tim Collier <osdevtc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 9133d5174425bd9f7f36f77097d7054f77baafaa..9af2aaf01e142fdf6d88790e67af9572be1fc80f 100644 (file)
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -595,7 +595,7 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
                data = MBM_TO_DBM(mbm);
 
        result = prism2_domibset_uint32(wlandev,
-               DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+               DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
                data);
 
        if (result) {
@@ -620,7 +620,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
        mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
        msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
        mibitem->did =
-           DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
+           DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL;
 
        result = p80211req_dorequest(wlandev, (u8 *)&msg);
 

diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 53f380f2f66f185d9942d0532ae61d3ca6fe8769..5d06b342b98063e8cb9943131bfcd1e52bfa685e 100644 (file)
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -206,7 +206,7 @@
 #define DIDMIB_DOT11PHY_OPERATIONTABLE \
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(1))
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \
+#define DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL \
                        (P80211DID_MKSECTION(3) | \
                        P80211DID_MKGROUP(3) | \
                        P80211DID_MKITEM(10) | 0x18000000)

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index dbe49bda8043d9a047152065385dd148848bf44b..33331e0d061bbc6de9e49618cc076255d37fb250 100644 (file)
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -210,7 +210,7 @@ static struct mibrec mibtab[] = {
         F_STA | F_READ,
         HFA384x_RID_CURRENTCHANNEL, 0, 0,
         prism2mib_uint32},
-       {DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+       {DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
         F_STA | F_READ | F_WRITE,
         HFA384x_RID_TXPOWERMAX, 0, 0,
         prism2mib_uint32},