---

yaml --- r: 259824 b: refs/heads/master c: b9a7429 h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · 500cd79 · 500cd79
1 parent 1411684
commit 500cd79
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb1d0aa25c1b2f659efb8fadd94dfe199d121044
+refs/heads/master: b9a74297521c822593f48bd42df46b06fcefcf51
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -31,8 +31,6 @@
 #include <brcmu_wifi.h>
 #include "sdio_host.h"
 
-extern void brcmf_sdbrcm_isr(void *args);
-
 #include "dngl_stats.h"
 #include "dhd.h"
 #include "dhd_bus.h"
@@ -195,8 +193,6 @@ int brcmf_sdio_remove(struct device *dev)
 	return 0;
 }
 
-extern int brcmf_sdio_function_init(void);
-
 int brcmf_sdio_register(struct brcmf_sdioh_driver *driver)
 {
 	drvinfo = *driver;
@@ -205,8 +201,6 @@ int brcmf_sdio_register(struct brcmf_sdioh_driver *driver)
 	return brcmf_sdio_function_init();
 }
 
-extern void brcmf_sdio_function_cleanup(void);
-
 void brcmf_sdio_unregister(void)
 {
 	brcmf_sdio_function_cleanup();

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -32,13 +32,9 @@
 #include "dhd.h"
 #include "bcmsdh_sdmmc.h"
 
-extern int brcmf_sdio_function_init(void);
-extern void brcmf_sdio_function_cleanup(void);
-
 static void brcmf_sdioh_irqhandler(struct sdio_func *func);
 static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func);
 static int brcmf_sdioh_get_cisaddr(struct sdioh_info *sd, u32 regaddr);
-extern int brcmf_sdioh_reset_comm(struct mmc_card *card);
 
 uint sd_f2_blocksize = 512;	/* Default blocksize */
 
@@ -50,8 +46,9 @@ BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait);
 
 #define DMA_ALIGN_MASK	0x03
 
-int brcmf_sdioh_card_regread(struct sdioh_info *sd, int func, u32 regaddr,
-			     int regsize, u32 *data);
+static int
+brcmf_sdioh_card_regread(struct sdioh_info *sd, int func, u32 regaddr,
+			 int regsize, u32 *data);
 
 static int brcmf_sdioh_enablefuncs(struct sdioh_info *sd)
 {

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
@@ -61,10 +61,6 @@
 #define sd_ctrl(x)
 #endif
 
-/* Allocate/init/free per-OS private data */
-extern int brcmf_sdioh_osinit(struct sdioh_info *sd);
-extern void brcmf_sdioh_osfree(struct sdioh_info *sd);
-
 #define BLOCK_SIZE_64 64
 #define BLOCK_SIZE_512 512
 #define BLOCK_SIZE_4318 64
@@ -108,6 +104,10 @@ struct sdioh_info {
 /* Global message bits */
 extern uint sd_msglevel;
 
+/* Allocate/init/free per-OS private data */
+extern int  brcmf_sdioh_osinit(struct sdioh_info *sd);
+extern void brcmf_sdioh_osfree(struct sdioh_info *sd);
+
 /* OS-independent interrupt handler */
 extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd);
 
@@ -124,7 +124,7 @@ extern u32 *brcmf_sdioh_reg_map(s32 addr, int size);
 extern void brcmf_sdioh_reg_unmap(s32 addr, int size);
 
 /* Interrupt (de)registration routines */
-extern int brcmf_sdioh_register_irq(struct sdioh_info *sd, uint irq);
+extern int  brcmf_sdioh_register_irq(struct sdioh_info *sd, uint irq);
 extern void brcmf_sdioh_free_irq(uint irq, struct sdioh_info *sd);
 
 typedef struct _BCMSDH_SDMMC_INSTANCE {

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -55,12 +55,6 @@
 #include "dhd_dbg.h"
 #include "wl_cfg80211.h"
 
-extern void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd);
-extern void brcmf_sdioh_dev_intr_on(struct sdioh_info *sd);
-
-int brcmf_sdio_function_init(void);
-void brcmf_sdio_function_cleanup(void);
-
 /* module param defaults */
 static int clockoverride;
 
@@ -72,8 +66,6 @@ PBCMSDH_SDMMC_INSTANCE gInstance;
 /* Maximum number of bcmsdh_sdmmc devices supported by driver */
 #define BCMSDH_SDMMC_MAX_DEVICES 1
 
-extern int brcmf_sdio_probe(struct device *dev);
-extern int brcmf_sdio_remove(struct device *dev);
 struct device sdmmc_dev;
 
 static int brcmf_ops_sdio_probe(struct sdio_func *func,

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -273,7 +273,6 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *dhd, int ifidx, uint cmd,
 	return ret;
 }
 
-extern int dhd_bus_interface(struct dhd_bus *bus, uint arg, void *arg2);
 int
 brcmf_proto_ioctl(struct brcmf_pub *dhd, int ifidx, struct brcmf_ioctl *ioc,
 		  void *buf, int len)

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/trunk/drivers/staging/brcm80211/brcmfmac/sdio_host.h
@@ -209,11 +209,20 @@ struct brcmf_sdioh_driver {
 	void (*detach) (void *ch);
 };
 
+struct sdioh_info;
+
 /* platform specific/high level functions */
+extern int brcmf_sdio_function_init(void);
 extern int brcmf_sdio_register(struct brcmf_sdioh_driver *driver);
 extern void brcmf_sdio_unregister(void);
 extern bool brcmf_sdio_chipmatch(u16 vendor, u16 device);
 extern void brcmf_sdio_device_remove(void *sdh);
+extern void brcmf_sdio_function_cleanup(void);
+
+extern void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd);
+extern void brcmf_sdioh_dev_intr_on(struct sdioh_info *sd);
+extern int brcmf_sdio_probe(struct device *dev);
+extern int brcmf_sdio_remove(struct device *dev);
 
 /* Function to pass device-status bits to DHD. */
 extern u32 brcmf_sdcard_get_dstatus(void *sdh);