Browse Source

brcmfmac: rename sdio_chip.[ch]

Just renaming the file. This file will contain chip related functions
that are independent of the host interface type.

Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Arend van Spriel 12 years ago
parent
commit
20c9c9bc14

+ 2 - 2
drivers/net/wireless/brcm80211/brcmfmac/Makefile

@@ -24,6 +24,7 @@ ccflags-y += -D__CHECK_ENDIAN__
 obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
 obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
 brcmfmac-objs += \
 brcmfmac-objs += \
 		wl_cfg80211.o \
 		wl_cfg80211.o \
+		chip.o \
 		fwil.o \
 		fwil.o \
 		fweh.o \
 		fweh.o \
 		fwsignal.o \
 		fwsignal.o \
@@ -36,8 +37,7 @@ brcmfmac-objs += \
 		btcoex.o
 		btcoex.o
 brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
 brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
 		dhd_sdio.o \
 		dhd_sdio.o \
-		bcmsdh.o \
-		sdio_chip.o
+		bcmsdh.o
 brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
 brcmfmac-$(CONFIG_BRCMFMAC_USB) += \
 		usb.o
 		usb.o
 brcmfmac-$(CONFIG_BRCMDBG) += \
 brcmfmac-$(CONFIG_BRCMDBG) += \

+ 0 - 1
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

@@ -43,7 +43,6 @@
 #include "dhd_bus.h"
 #include "dhd_bus.h"
 #include "dhd_dbg.h"
 #include "dhd_dbg.h"
 #include "sdio_host.h"
 #include "sdio_host.h"
-#include "sdio_chip.h"
 
 
 #define SDIOH_API_ACCESS_RETRY_LIMIT	2
 #define SDIOH_API_ACCESS_RETRY_LIMIT	2
 
 

+ 2 - 2
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c → drivers/net/wireless/brcm80211/brcmfmac/chip.c

@@ -30,7 +30,7 @@
 #include <soc.h>
 #include <soc.h>
 #include "dhd_dbg.h"
 #include "dhd_dbg.h"
 #include "sdio_host.h"
 #include "sdio_host.h"
-#include "sdio_chip.h"
+#include "chip.h"
 
 
 /* chip core base & ramsize */
 /* chip core base & ramsize */
 /* bcm4329 */
 /* bcm4329 */
@@ -127,7 +127,7 @@ brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,
 				    NULL);
 				    NULL);
 	regdata &= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |
 	regdata &= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |
 		    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);
 		    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);
-	return (SSB_TMSLOW_CLOCK == regdata);
+	return SSB_TMSLOW_CLOCK == regdata;
 }
 }
 
 
 static bool
 static bool

+ 0 - 0
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h → drivers/net/wireless/brcm80211/brcmfmac/chip.h


+ 1 - 1
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

@@ -40,7 +40,7 @@
 #include <brcm_hw_ids.h>
 #include <brcm_hw_ids.h>
 #include <soc.h>
 #include <soc.h>
 #include "sdio_host.h"
 #include "sdio_host.h"
-#include "sdio_chip.h"
+#include "chip.h"
 #include "nvram.h"
 #include "nvram.h"
 
 
 #define DCMD_RESP_TIMEOUT  2000	/* In milli second */
 #define DCMD_RESP_TIMEOUT  2000	/* In milli second */