Shorten the names of the p80211metadef.h macros prefixed with
"DIDMIB_P2_" by removing repeat use of "P2" to reduce long lines and
ease readabbility.
Signed-off-by: Tim Collier <osdevtc@xxxxxxxxx>
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 10 +++++-----
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 4 ++--
drivers/staging/wlan-ng/prism2sta.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 9ceb1727030d..a2f1136b97fa 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -129,7 +129,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
/* Set Operation mode to the PORT TYPE RID */
result = prism2_domibset_uint32(wlandev,
- DIDMIB_P2_P2STATIC_P2CNFPORTTYPE,
+ DIDMIB_P2_STATIC_CNFPORTTYPE,
data);
if (result)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index ea0113765e40..95e79a32abfb 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -228,21 +228,21 @@
P80211DID_MKITEM(1) | 0x18000000)
#define DIDMIB_CAT_P2 \
P80211DID_MKSECTION(5)
-#define DIDMIB_P2_P2STATIC \
+#define DIDMIB_P2_STATIC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2))
-#define DIDMIB_P2_P2STATIC_P2CNFPORTTYPE \
+#define DIDMIB_P2_STATIC_CNFPORTTYPE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(1) | 0x18000000)
-#define DIDMIB_P2_P2NIC_P2PRISUPRANGE \
+#define DIDMIB_P2_NIC_PRISUPRANGE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(6) | 0x10000000)
-#define DIDMIB_P2_P2MAC \
+#define DIDMIB_P2_MAC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6))
-#define DIDMIB_P2_P2MAC_P2CURRENTTXRATE \
+#define DIDMIB_P2_MAC_CURRENTTXRATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(12) | 0x10000000)
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index b13601cb02d3..f99626ca6bdc 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -304,7 +304,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value;
item = (struct p80211itemd *)getmsg.mibattribute.data;
- item->did = DIDMIB_P2_P2NIC_P2PRISUPRANGE;
+ item->did = DIDMIB_P2_NIC_PRISUPRANGE;
item->status = P80211ENUM_msgitem_status_no_value;
data = (u32 *)item->data;
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 427805eebd84..32a634478cc1 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -217,14 +217,14 @@ static struct mibrec mibtab[] = {
/* p2Static MIB's */
- {DIDMIB_P2_P2STATIC_P2CNFPORTTYPE,
+ {DIDMIB_P2_STATIC_CNFPORTTYPE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFPORTTYPE, 0, 0,
prism2mib_uint32},
/* p2MAC MIB's */
- {DIDMIB_P2_P2MAC_P2CURRENTTXRATE,
+ {DIDMIB_P2_MAC_CURRENTTXRATE,
F_STA | F_READ,
HFA384x_RID_CURRENTTXRATE, 0, 0,
prism2mib_uint32},
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 537b49c1d6f1..83e80fbf9c6a 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1950,7 +1950,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
/* Get the signal rate */
msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
- mibitem->did = DIDMIB_P2_P2MAC_P2CURRENTTXRATE;
+ mibitem->did = DIDMIB_P2_MAC_CURRENTTXRATE;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
if (result) {
--
2.11.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
