brcmfmac: Use consistent naming for BCDC.

The BCDC protocol layer is using a mix of naming of CDC, BDC and
BCDC. Use the name BCDC consistenly over all functions, defines
and variables. This patch does not change code functionality.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 95 insertions, 106 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
index b5a252908777..06848e426f9a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
@@ -33,7 +33,7 @@
 #include "proto.h"
 #include "bcdc.h"
 
-struct brcmf_proto_cdc_dcmd {
+struct brcmf_proto_bcdc_dcmd {
         __le32 cmd;     /* dongle command value */
         __le32 len;     /* lower 16: output buflen;
                          * upper 16: input buflen (excludes header) */
@@ -42,47 +42,47 @@ struct brcmf_proto_cdc_dcmd {
 };
 
 /* Max valid buffer size that can be sent to the dongle */
-#define CDC_MAX_MSG_SIZE        (ETH_FRAME_LEN+ETH_FCS_LEN)
-
-/* CDC flag definitions */
-#define CDC_DCMD_ERROR          0x01    /* 1=cmd failed */
-#define CDC_DCMD_SET            0x02    /* 0=get, 1=set cmd */
-#define CDC_DCMD_IF_MASK        0xF000          /* I/F index */
-#define CDC_DCMD_IF_SHIFT       12
-#define CDC_DCMD_ID_MASK        0xFFFF0000      /* id an cmd pairing */
-#define CDC_DCMD_ID_SHIFT       16              /* ID Mask shift bits */
-#define CDC_DCMD_ID(flags)      \
-        (((flags) & CDC_DCMD_ID_MASK) >> CDC_DCMD_ID_SHIFT)
+#define BCDC_MAX_MSG_SIZE       (ETH_FRAME_LEN+ETH_FCS_LEN)
+
+/* BCDC flag definitions */
+#define BCDC_DCMD_ERROR         0x01            /* 1=cmd failed */
+#define BCDC_DCMD_SET           0x02            /* 0=get, 1=set cmd */
+#define BCDC_DCMD_IF_MASK       0xF000          /* I/F index */
+#define BCDC_DCMD_IF_SHIFT      12
+#define BCDC_DCMD_ID_MASK       0xFFFF0000      /* id an cmd pairing */
+#define BCDC_DCMD_ID_SHIFT      16              /* ID Mask shift bits */
+#define BCDC_DCMD_ID(flags)     \
+        (((flags) & BCDC_DCMD_ID_MASK) >> BCDC_DCMD_ID_SHIFT)
 
 /*
- * BDC header - Broadcom specific extension of CDC.
+ * BCDC header - Broadcom specific extension of CDC.
  * Used on data packets to convey priority across USB.
  */
-#define BDC_HEADER_LEN          4
-#define BDC_PROTO_VER           2       /* Protocol version */
-#define BDC_FLAG_VER_MASK       0xf0    /* Protocol version mask */
-#define BDC_FLAG_VER_SHIFT      4       /* Protocol version shift */
-#define BDC_FLAG_SUM_GOOD       0x04    /* Good RX checksums */
-#define BDC_FLAG_SUM_NEEDED     0x08    /* Dongle needs to do TX checksums */
-#define BDC_PRIORITY_MASK       0x7
-#define BDC_FLAG2_IF_MASK       0x0f    /* packet rx interface in APSTA */
-#define BDC_FLAG2_IF_SHIFT      0
-
-#define BDC_GET_IF_IDX(hdr) \
-        ((int)((((hdr)->flags2) & BDC_FLAG2_IF_MASK) >> BDC_FLAG2_IF_SHIFT))
-#define BDC_SET_IF_IDX(hdr, idx) \
-        ((hdr)->flags2 = (((hdr)->flags2 & ~BDC_FLAG2_IF_MASK) | \
-        ((idx) << BDC_FLAG2_IF_SHIFT)))
+#define BCDC_HEADER_LEN         4
+#define BCDC_PROTO_VER          2       /* Protocol version */
+#define BCDC_FLAG_VER_MASK      0xf0    /* Protocol version mask */
+#define BCDC_FLAG_VER_SHIFT     4       /* Protocol version shift */
+#define BCDC_FLAG_SUM_GOOD      0x04    /* Good RX checksums */
+#define BCDC_FLAG_SUM_NEEDED    0x08    /* Dongle needs to do TX checksums */
+#define BCDC_PRIORITY_MASK      0x7
+#define BCDC_FLAG2_IF_MASK      0x0f    /* packet rx interface in APSTA */
+#define BCDC_FLAG2_IF_SHIFT     0
+
+#define BCDC_GET_IF_IDX(hdr) \
+        ((int)((((hdr)->flags2) & BCDC_FLAG2_IF_MASK) >> BCDC_FLAG2_IF_SHIFT))
+#define BCDC_SET_IF_IDX(hdr, idx) \
+        ((hdr)->flags2 = (((hdr)->flags2 & ~BCDC_FLAG2_IF_MASK) | \
+        ((idx) << BCDC_FLAG2_IF_SHIFT)))
 
 /**
- * struct brcmf_proto_bdc_header - BDC header format
+ * struct brcmf_proto_bcdc_header - BCDC header format
  *
  * @flags: flags contain protocol and checksum info.
  * @priority: 802.1d priority and USB flow control info (bit 4:7).
  * @flags2: additional flags containing dongle interface index.
  * @data_offset: start of packet data. header is following by firmware signals.
  */
-struct brcmf_proto_bdc_header {
+struct brcmf_proto_bcdc_header {
         u8 flags;
         u8 priority;
         u8 flags2;
@@ -91,7 +91,7 @@ struct brcmf_proto_bdc_header {
 
 /*
  * maximum length of firmware signal data between
- * the BDC header and packet data in the tx path.
+ * the BCDC header and packet data in the tx path.
  */
 #define BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES        12
 
@@ -109,42 +109,42 @@ struct brcmf_proto_bdc_header {
 struct brcmf_bcdc {
         u16 reqid;
         u8 bus_header[BUS_HEADER_LEN];
-        struct brcmf_proto_cdc_dcmd msg;
+        struct brcmf_proto_bcdc_dcmd msg;
         unsigned char buf[BRCMF_DCMD_MAXLEN + ROUND_UP_MARGIN];
 };
 
-static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr)
+static int brcmf_proto_bcdc_msg(struct brcmf_pub *drvr)
 {
         struct brcmf_bcdc *bcdc = (struct brcmf_bcdc *)drvr->proto->pd;
         int len = le32_to_cpu(bcdc->msg.len) +
-                        sizeof(struct brcmf_proto_cdc_dcmd);
+                        sizeof(struct brcmf_proto_bcdc_dcmd);
 
-        brcmf_dbg(CDC, "Enter\n");
+        brcmf_dbg(BCDC, "Enter\n");
 
-        /* NOTE : cdc->msg.len holds the desired length of the buffer to be
-         *        returned. Only up to CDC_MAX_MSG_SIZE of this buffer area
+        /* NOTE : bcdc->msg.len holds the desired length of the buffer to be
+         *        returned. Only up to BCDC_MAX_MSG_SIZE of this buffer area
          *        is actually sent to the dongle
          */
-        if (len > CDC_MAX_MSG_SIZE)
-                len = CDC_MAX_MSG_SIZE;
+        if (len > BCDC_MAX_MSG_SIZE)
+                len = BCDC_MAX_MSG_SIZE;
 
         /* Send request */
         return brcmf_bus_txctl(drvr->bus_if, (unsigned char *)&bcdc->msg, len);
 }
 
-static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
+static int brcmf_proto_bcdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
 {
         int ret;
         struct brcmf_bcdc *bcdc = (struct brcmf_bcdc *)drvr->proto->pd;
 
-        brcmf_dbg(CDC, "Enter\n");
-        len += sizeof(struct brcmf_proto_cdc_dcmd);
+        brcmf_dbg(BCDC, "Enter\n");
+        len += sizeof(struct brcmf_proto_bcdc_dcmd);
         do {
                 ret = brcmf_bus_rxctl(drvr->bus_if, (unsigned char *)&bcdc->msg,
                                       len);
                 if (ret < 0)
                         break;
-        } while (CDC_DCMD_ID(le32_to_cpu(bcdc->msg.flags)) != id);
+        } while (BCDC_DCMD_ID(le32_to_cpu(bcdc->msg.flags)) != id);
 
         return ret;
 }
@@ -154,40 +154,40 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
                             void *buf, uint len)
 {