Commit b9a74297 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed global function declarations from .c files

Code cleanup. Function declarations were moved to .h files.
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fb1d0aa2
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include <brcmu_wifi.h> #include <brcmu_wifi.h>
#include "sdio_host.h" #include "sdio_host.h"
extern void brcmf_sdbrcm_isr(void *args);
#include "dngl_stats.h" #include "dngl_stats.h"
#include "dhd.h" #include "dhd.h"
#include "dhd_bus.h" #include "dhd_bus.h"
...@@ -195,8 +193,6 @@ int brcmf_sdio_remove(struct device *dev) ...@@ -195,8 +193,6 @@ int brcmf_sdio_remove(struct device *dev)
return 0; return 0;
} }
extern int brcmf_sdio_function_init(void);
int brcmf_sdio_register(struct brcmf_sdioh_driver *driver) int brcmf_sdio_register(struct brcmf_sdioh_driver *driver)
{ {
drvinfo = *driver; drvinfo = *driver;
...@@ -205,8 +201,6 @@ int brcmf_sdio_register(struct brcmf_sdioh_driver *driver) ...@@ -205,8 +201,6 @@ int brcmf_sdio_register(struct brcmf_sdioh_driver *driver)
return brcmf_sdio_function_init(); return brcmf_sdio_function_init();
} }
extern void brcmf_sdio_function_cleanup(void);
void brcmf_sdio_unregister(void) void brcmf_sdio_unregister(void)
{ {
brcmf_sdio_function_cleanup(); brcmf_sdio_function_cleanup();
......
...@@ -32,13 +32,9 @@ ...@@ -32,13 +32,9 @@
#include "dhd.h" #include "dhd.h"
#include "bcmsdh_sdmmc.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(struct sdio_func *func);
static void brcmf_sdioh_irqhandler_f2(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); 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 */ uint sd_f2_blocksize = 512; /* Default blocksize */
...@@ -50,7 +46,8 @@ BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait); ...@@ -50,7 +46,8 @@ BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait);
#define DMA_ALIGN_MASK 0x03 #define DMA_ALIGN_MASK 0x03
int brcmf_sdioh_card_regread(struct sdioh_info *sd, int func, u32 regaddr, static int
brcmf_sdioh_card_regread(struct sdioh_info *sd, int func, u32 regaddr,
int regsize, u32 *data); int regsize, u32 *data);
static int brcmf_sdioh_enablefuncs(struct sdioh_info *sd) static int brcmf_sdioh_enablefuncs(struct sdioh_info *sd)
......
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
#define sd_ctrl(x) #define sd_ctrl(x)
#endif #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_64 64
#define BLOCK_SIZE_512 512 #define BLOCK_SIZE_512 512
#define BLOCK_SIZE_4318 64 #define BLOCK_SIZE_4318 64
...@@ -108,6 +104,10 @@ struct sdioh_info { ...@@ -108,6 +104,10 @@ struct sdioh_info {
/* Global message bits */ /* Global message bits */
extern uint sd_msglevel; 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 */ /* OS-independent interrupt handler */
extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd); extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd);
......
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
#include "dhd_dbg.h" #include "dhd_dbg.h"
#include "wl_cfg80211.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 */ /* module param defaults */
static int clockoverride; static int clockoverride;
...@@ -72,8 +66,6 @@ PBCMSDH_SDMMC_INSTANCE gInstance; ...@@ -72,8 +66,6 @@ PBCMSDH_SDMMC_INSTANCE gInstance;
/* Maximum number of bcmsdh_sdmmc devices supported by driver */ /* Maximum number of bcmsdh_sdmmc devices supported by driver */
#define BCMSDH_SDMMC_MAX_DEVICES 1 #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; struct device sdmmc_dev;
static int brcmf_ops_sdio_probe(struct sdio_func *func, static int brcmf_ops_sdio_probe(struct sdio_func *func,
......
...@@ -273,7 +273,6 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *dhd, int ifidx, uint cmd, ...@@ -273,7 +273,6 @@ int brcmf_proto_cdc_set_ioctl(struct brcmf_pub *dhd, int ifidx, uint cmd,
return ret; return ret;
} }
extern int dhd_bus_interface(struct dhd_bus *bus, uint arg, void *arg2);
int int
brcmf_proto_ioctl(struct brcmf_pub *dhd, int ifidx, struct brcmf_ioctl *ioc, brcmf_proto_ioctl(struct brcmf_pub *dhd, int ifidx, struct brcmf_ioctl *ioc,
void *buf, int len) void *buf, int len)
......
...@@ -209,11 +209,20 @@ struct brcmf_sdioh_driver { ...@@ -209,11 +209,20 @@ struct brcmf_sdioh_driver {
void (*detach) (void *ch); void (*detach) (void *ch);
}; };
struct sdioh_info;
/* platform specific/high level functions */ /* platform specific/high level functions */
extern int brcmf_sdio_function_init(void);
extern int brcmf_sdio_register(struct brcmf_sdioh_driver *driver); extern int brcmf_sdio_register(struct brcmf_sdioh_driver *driver);
extern void brcmf_sdio_unregister(void); extern void brcmf_sdio_unregister(void);
extern bool brcmf_sdio_chipmatch(u16 vendor, u16 device); extern bool brcmf_sdio_chipmatch(u16 vendor, u16 device);
extern void brcmf_sdio_device_remove(void *sdh); 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. */ /* Function to pass device-status bits to DHD. */
extern u32 brcmf_sdcard_get_dstatus(void *sdh); extern u32 brcmf_sdcard_get_dstatus(void *sdh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment