brcm80211: fmac: move idle macros to dhd_sdio.c

The idle macros are only used by dhd_sdio.c. It's more appropriate
to place them in dhd_sdio.c instead of dhd.h.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index a828d82fcc8c5a6e9db5f77f147e3829ee890bac..e58ea40a75b0679645a983a715fbfa1e71fb0fe3 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -667,10 +667,4 @@ extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg,
 #define BRCMF_DCMD_MEDLEN      1536    /* "med" cmd buffer required */
 #define        BRCMF_DCMD_MAXLEN       8192    /* max length cmd buffer required */
 
-/* Enter idle immediately (no timeout) */
-#define BRCMF_IDLE_IMMEDIATE   (-1)
-#define BRCMF_IDLE_ACTIVE      0       /* Do not request any SD clock change
-                                when idle */
-#define BRCMF_IDLE_INTERVAL    1
-
 #endif                         /* _BRCMF_H_ */

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 800007f17d9c14731182c9a08d273240e3cfdee4..a8e7ca5466d1b9ab11af31cb62f41e1364dc092f 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -314,6 +314,12 @@ struct rte_console {
 MODULE_FIRMWARE(BRCMFMAC_FW_NAME);
 MODULE_FIRMWARE(BRCMFMAC_NV_NAME);
 
+#define BRCMF_IDLE_IMMEDIATE   (-1)    /* Enter idle immediately */
+#define BRCMF_IDLE_ACTIVE      0       /* Do not request any SD clock change
+                                        * when idle
+                                        */
+#define BRCMF_IDLE_INTERVAL    1
+
 /*
  * Conversion of 802.1D priority to precedence level
  */