brcmfmac: Tidy register definitions a little

Trivial tidy of register definitions.

Signed-off-by: Ian Molton <ian@mnementh.co.uk>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 608c5f8..e0b201f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -153,9 +153,9 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)
                brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, data, &ret);
 
                /* redirect, configure and enable io for interrupt signal */
-               data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
+               data = SDIO_CCCR_BRCM_SEPINT_MASK | SDIO_CCCR_BRCM_SEPINT_OE;
                if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
-                       data |= SDIO_SEPINT_ACT_HI;
+                       data |= SDIO_CCCR_BRCM_SEPINT_ACT_HI;
                brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT,
                                     data, &ret);
                sdio_release_host(sdiodev->func[1]);

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
index 453213b..01def16 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
@@ -52,16 +52,17 @@
 /* function 0 vendor specific CCCR registers */
 
 #define SDIO_CCCR_BRCM_CARDCAP                 0xf0
-#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT   0x02
-#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT       0x04
-#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC       0x08
-#define SDIO_CCCR_BRCM_CARDCTRL                0xf1
-#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET      0x02
-#define SDIO_CCCR_BRCM_SEPINT                  0xf2
+#define SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT   BIT(1)
+#define SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT       BIT(2)
+#define SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC       BIT(3)
+
+#define SDIO_CCCR_BRCM_CARDCTRL                        0xf1
+#define SDIO_CCCR_BRCM_CARDCTRL_WLANRESET      BIT(1)
 
-#define  SDIO_SEPINT_MASK              0x01
-#define  SDIO_SEPINT_OE                        0x02
-#define  SDIO_SEPINT_ACT_HI            0x04
+#define SDIO_CCCR_BRCM_SEPINT                  0xf2
+#define SDIO_CCCR_BRCM_SEPINT_MASK             BIT(0)
+#define SDIO_CCCR_BRCM_SEPINT_OE               BIT(1)
+#define SDIO_CCCR_BRCM_SEPINT_ACT_HI           BIT(2)
 
 /* function 1 miscellaneous registers */