Skip to content

L
linux
Commit 46c3db78 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files
Options

staging: brcm80211: rename dhd_bus structure and functions 

The header file dhd_bus.h contains several function prototypes
starting with dhd_bus_ and using parameter with struct dhd_bus.
These function and structure have been renamed to brcmf_bus.
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6758a717
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 125 deletions
drivers/staging/brcm80211/brcmfmac/dhd.h
View file @ 46c3db78
...@@ -522,14 +522,14 @@ struct brcmf_ioctl { ...@@ -522,14 +522,14 @@ struct brcmf_ioctl {
}; };
/* Forward decls for struct brcmf_pub (see below) */ /* Forward decls for struct brcmf_pub (see below) */
struct dhd_bus; /* device bus info */ struct brcmf_bus; /* device bus info */
struct brcmf_proto; /* device communication protocol info */ struct brcmf_proto; /* device communication protocol info */
struct brcmf_info; /* device driver info */ struct brcmf_info; /* device driver info */
/* Common structure for module and instance linkage */ /* Common structure for module and instance linkage */
struct brcmf_pub { struct brcmf_pub {
/* Linkage ponters */ /* Linkage ponters */
struct dhd_bus *bus; struct brcmf_bus *bus;
struct brcmf_proto *prot; struct brcmf_proto *prot;
struct brcmf_info *info; struct brcmf_info *info;
...@@ -753,7 +753,7 @@ static inline void MUTEX_UNLOCK_WL_SCAN_SET(void) ...@@ -753,7 +753,7 @@ static inline void MUTEX_UNLOCK_WL_SCAN_SET(void)
* Returned structure should have bus and prot pointers filled in. * Returned structure should have bus and prot pointers filled in.
* bus_hdrlen specifies required headroom for bus module header. * bus_hdrlen specifies required headroom for bus module header.
*/ */
extern struct brcmf_pub *brcmf_attach(struct dhd_bus *bus, extern struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus,
uint bus_hdrlen); uint bus_hdrlen);
extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx); extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);
extern int brcmf_netdev_wait_pend8021x(struct net_device *dev); extern int brcmf_netdev_wait_pend8021x(struct net_device *dev);
......
drivers/staging/brcm80211/brcmfmac/dhd_bus.h
View file @ 46c3db78
...@@ -33,26 +33,26 @@ ...@@ -33,26 +33,26 @@
extern uint brcmf_watchdog_ms; extern uint brcmf_watchdog_ms;
/* Indicate (dis)interest in finding dongles. */ /* Indicate (dis)interest in finding dongles. */
extern int dhd_bus_register(void); extern int brcmf_bus_register(void);
extern void dhd_bus_unregister(void); extern void brcmf_bus_unregister(void);
/* Stop bus module: clear pending frames, disable data flow */ /* Stop bus module: clear pending frames, disable data flow */
extern void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex); extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex);
/* Initialize bus module: prepare for communication w/dongle */ /* Initialize bus module: prepare for communication w/dongle */
extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex); extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex);
/* Send a data frame to the dongle. Callee disposes of txp. */ /* Send a data frame to the dongle. Callee disposes of txp. */
extern int brcmf_sdbrcm_bus_txdata(struct dhd_bus *bus, struct sk_buff *txp); extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);
/* Send/receive a control message to/from the dongle. /* Send/receive a control message to/from the dongle.
* Expects caller to enforce a single outstanding transaction. * Expects caller to enforce a single outstanding transaction.
*/ */
extern int extern int
brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen); brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);
extern int extern int
brcmf_sdbrcm_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen); brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);
extern void dhd_bus_isr(bool *InterruptRecognized, extern void dhd_bus_isr(bool *InterruptRecognized,
bool *QueueMiniportHandleInterrupt, void *arg); bool *QueueMiniportHandleInterrupt, void *arg);
...@@ -67,15 +67,15 @@ extern void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, ...@@ -67,15 +67,15 @@ extern void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr,
struct brcmu_strbuf *strbuf); struct brcmu_strbuf *strbuf);
/* Clear any bus counters */ /* Clear any bus counters */
extern void dhd_bus_clearcounts(struct brcmf_pub *drvr); extern void brcmf_bus_clearcounts(struct brcmf_pub *drvr);
/* return the dongle chipid */ /* return the dongle chipid */
extern uint dhd_bus_chip(struct dhd_bus *bus); extern uint brcmf_bus_chip(struct brcmf_bus *bus);
extern void *dhd_bus_pub(struct dhd_bus *bus); extern void *brcmf_bus_drvr(struct brcmf_bus *bus);
extern void *dhd_bus_txq(struct dhd_bus *bus); extern void *brcmf_bus_txq(struct brcmf_bus *bus);
extern uint dhd_bus_hdrlen(struct dhd_bus *bus); extern uint brcmf_bus_hdrlen(struct brcmf_bus *bus);
extern void brcmf_sdbrcm_wd_timer(struct dhd_bus *bus, uint wdtick); extern void brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick);
#endif /* _dhd_bus_h_ */ #endif /* _dhd_bus_h_ */
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file @ 46c3db78
...@@ -225,7 +225,7 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi, ...@@ -225,7 +225,7 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi,
drvr->tx_realloc = 0; drvr->tx_realloc = 0;
drvr->wd_dpc_sched = 0; drvr->wd_dpc_sched = 0;
memset(&drvr->dstats, 0, sizeof(drvr->dstats)); memset(&drvr->dstats, 0, sizeof(drvr->dstats));
dhd_bus_clearcounts(drvr); brcmf_bus_clearcounts(drvr);
break; break;
case IOV_GVAL(IOV_IOCTLTIMEOUT):{ case IOV_GVAL(IOV_IOCTLTIMEOUT):{
......
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file @ 46c3db78
...@@ -1426,7 +1426,7 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx) ...@@ -1426,7 +1426,7 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx)
up(&drvr_priv->sysioc_sem); up(&drvr_priv->sysioc_sem);
} }
struct brcmf_pub *brcmf_attach(struct dhd_bus *bus, uint bus_hdrlen) struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
{ {
struct brcmf_info *drvr_priv = NULL; struct brcmf_info *drvr_priv = NULL;
struct net_device *net; struct net_device *net;
...@@ -1761,7 +1761,7 @@ static void __exit brcmf_module_cleanup(void) ...@@ -1761,7 +1761,7 @@ static void __exit brcmf_module_cleanup(void)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
dhd_bus_unregister(); brcmf_bus_unregister();
} }
static int __init brcmf_module_init(void) static int __init brcmf_module_init(void)
...@@ -1770,7 +1770,7 @@ static int __init brcmf_module_init(void) ...@@ -1770,7 +1770,7 @@ static int __init brcmf_module_init(void)
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
error = dhd_bus_register(); error = brcmf_bus_register();
if (error) { if (error) {
DHD_ERROR(("%s: dhd_bus_register failed\n", __func__)); DHD_ERROR(("%s: dhd_bus_register failed\n", __func__));
......
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file @ 46c3db78
...@@ -542,7 +542,7 @@ struct chip_info { ...@@ -542,7 +542,7 @@ struct chip_info {
}; };
/* Private data for SDIO bus interaction */ /* Private data for SDIO bus interaction */
typedef struct dhd_bus { struct brcmf_bus {
struct brcmf_pub *drvr; struct brcmf_pub *drvr;
struct brcmf_sdio_card *card; /* Handle for sdio card calls */ struct brcmf_sdio_card *card; /* Handle for sdio card calls */
...@@ -695,7 +695,7 @@ typedef struct dhd_bus { ...@@ -695,7 +695,7 @@ typedef struct dhd_bus {
const struct firmware *firmware; const struct firmware *firmware;
const char *nv_name; const char *nv_name;
u32 fw_ptr; u32 fw_ptr;
} dhd_bus_t; };
typedef volatile struct _sbconfig { typedef volatile struct _sbconfig {
u32 PAD[2]; u32 PAD[2];
...@@ -865,74 +865,74 @@ do { \ ...@@ -865,74 +865,74 @@ do { \
#define HOSTINTMASK (I_HMB_SW_MASK | I_CHIPACTIVE) #define HOSTINTMASK (I_HMB_SW_MASK | I_CHIPACTIVE)
#ifdef SDTEST #ifdef SDTEST
static void brcmf_sdbrcm_checkdied(dhd_bus_t *bus, void *pkt, uint seq); static void brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, void *pkt, uint seq);
static void brcmf_sdbrcm_sdtest_set(dhd_bus_t *bus, bool start); static void brcmf_sdbrcm_sdtest_set(struct brcmf_bus *bus, bool start);
#endif #endif
#ifdef BCMDBG #ifdef BCMDBG
static int brcmf_sdbrcm_bus_console_in(struct brcmf_pub *drvr, static int brcmf_sdbrcm_bus_console_in(struct brcmf_pub *drvr,
unsigned char *msg, uint msglen); unsigned char *msg, uint msglen);
static int brcmf_sdbrcm_checkdied(dhd_bus_t *bus, u8 *data, uint size); static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size);
static int brcmf_sdbrcm_mem_dump(dhd_bus_t *bus); static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus);
#endif /* BCMDBG */ #endif /* BCMDBG */
static int brcmf_sdbrcm_download_state(dhd_bus_t *bus, bool enter); static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter);
static void brcmf_sdbrcm_release(dhd_bus_t *bus); static void brcmf_sdbrcm_release(struct brcmf_bus *bus);
static void brcmf_sdbrcm_release_malloc(dhd_bus_t *bus); static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus);
static void brcmf_sdbrcm_disconnect(void *ptr); static void brcmf_sdbrcm_disconnect(void *ptr);
static bool brcmf_sdbrcm_chipmatch(u16 chipid); static bool brcmf_sdbrcm_chipmatch(u16 chipid);
static bool brcmf_sdbrcm_probe_attach(dhd_bus_t *bus, void *card, static bool brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, void *card,
void *regsva, u16 devid); void *regsva, u16 devid);
static bool brcmf_sdbrcm_probe_malloc(dhd_bus_t *bus, void *card); static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus, void *card);
static bool brcmf_sdbrcm_probe_init(dhd_bus_t *bus, void *card); static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus, void *card);
static void brcmf_sdbrcm_release_dongle(dhd_bus_t *bus); static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus);
static uint brcmf_process_nvram_vars(char *varbuf, uint len); static uint brcmf_process_nvram_vars(char *varbuf, uint len);
static void brcmf_sdbrcm_setmemsize(struct dhd_bus *bus, int mem_size); static void brcmf_sdbrcm_setmemsize(struct brcmf_bus *bus, int mem_size);
static int brcmf_sdbrcm_send_buf(dhd_bus_t *bus, u32 addr, uint fn, static int brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn,
uint flags, u8 *buf, uint nbytes, uint flags, u8 *buf, uint nbytes,
struct sk_buff *pkt, struct sk_buff *pkt,
brcmf_sdio_cmplt_fn_t complete, void *handle); brcmf_sdio_cmplt_fn_t complete, void *handle);
static bool brcmf_sdbrcm_download_firmware(struct dhd_bus *bus, void *card); static bool brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus, void *card);
static int _brcmf_sdbrcm_download_firmware(struct dhd_bus *bus); static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus);
static int brcmf_sdbrcm_download_code_file(struct dhd_bus *bus); static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus);
static int brcmf_sdbrcm_download_nvram(struct dhd_bus *bus); static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus);
static void static void
brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_card *card, u32 corebase); brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_card *card, u32 corebase);
static int brcmf_sdbrcm_chip_attach(struct dhd_bus *bus, void *regs); static int brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, void *regs);
static void static void
brcmf_sdbrcm_chip_resetcore(struct brcmf_sdio_card *card, u32 corebase); brcmf_sdbrcm_chip_resetcore(struct brcmf_sdio_card *card, u32 corebase);
static void brcmf_sdbrcm_sdiod_drive_strength_init(struct dhd_bus *bus, static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,
u32 drivestrength); u32 drivestrength);
static void brcmf_sdbrcm_chip_detach(struct dhd_bus *bus); static void brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus);
static void brcmf_sdbrcm_wait_for_event(dhd_bus_t *bus, bool *lockvar); static void brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar);
static void brcmf_sdbrcm_wait_event_wakeup(dhd_bus_t *bus); static void brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus);
static void brcmf_sdbrcm_watchdog(unsigned long data); static void brcmf_sdbrcm_watchdog(unsigned long data);
static int brcmf_sdbrcm_watchdog_thread(void *data); static int brcmf_sdbrcm_watchdog_thread(void *data);
static int brcmf_sdbrcm_dpc_thread(void *data); static int brcmf_sdbrcm_dpc_thread(void *data);
static void brcmf_sdbrcm_dpc_tasklet(unsigned long data); static void brcmf_sdbrcm_dpc_tasklet(unsigned long data);
static void brcmf_sdbrcm_sched_dpc(dhd_bus_t *bus); static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus);
static void brcmf_sdbrcm_sdlock(dhd_bus_t *bus); static void brcmf_sdbrcm_sdlock(struct brcmf_bus *bus);
static void brcmf_sdbrcm_sdunlock(dhd_bus_t *bus); static void brcmf_sdbrcm_sdunlock(struct brcmf_bus *bus);
static int brcmf_sdbrcm_get_image(char *buf, int len, struct dhd_bus *bus); static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus);
/* Packet free applicable unconditionally for sdio and sdspi. /* Packet free applicable unconditionally for sdio and sdspi.
* Conditional if bufpool was present for gspi bus. * Conditional if bufpool was present for gspi bus.
*/ */
static void brcmf_sdbrcm_pktfree2(dhd_bus_t *bus, struct sk_buff *pkt) static void brcmf_sdbrcm_pktfree2(struct brcmf_bus *bus, struct sk_buff *pkt)
{ {
if ((bus->bus != SPI_BUS) || bus->usebufpool) if ((bus->bus != SPI_BUS) || bus->usebufpool)
brcmu_pkt_buf_free_skb(pkt); brcmu_pkt_buf_free_skb(pkt);
} }
static void brcmf_sdbrcm_setmemsize(struct dhd_bus *bus, int mem_size) static void brcmf_sdbrcm_setmemsize(struct brcmf_bus *bus, int mem_size)
{ {
s32 min_size = DONGLE_MIN_MEMSIZE; s32 min_size = DONGLE_MIN_MEMSIZE;
/* Restrict the memsize to user specified limit */ /* Restrict the memsize to user specified limit */
...@@ -943,7 +943,7 @@ static void brcmf_sdbrcm_setmemsize(struct dhd_bus *bus, int mem_size) ...@@ -943,7 +943,7 @@ static void brcmf_sdbrcm_setmemsize(struct dhd_bus *bus, int mem_size)
bus->ramsize = brcmf_dongle_memsize; bus->ramsize = brcmf_dongle_memsize;
} }
static int brcmf_sdbrcm_set_siaddr_window(dhd_bus_t *bus, u32 address) static int brcmf_sdbrcm_set_siaddr_window(struct brcmf_bus *bus, u32 address)
{ {
int err = 0; int err = 0;
brcmf_sdcard_cfg_write(bus->card, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW, brcmf_sdcard_cfg_write(bus->card, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW,
...@@ -961,7 +961,7 @@ static int brcmf_sdbrcm_set_siaddr_window(dhd_bus_t *bus, u32 address) ...@@ -961,7 +961,7 @@ static int brcmf_sdbrcm_set_siaddr_window(dhd_bus_t *bus, u32 address)
} }
/* Turn backplane clock on or off */ /* Turn backplane clock on or off */
static int brcmf_sdbrcm_htclk(dhd_bus_t *bus, bool on, bool pendok) static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
{ {
int err; int err;
u8 clkctl, clkreq, devctl; u8 clkctl, clkreq, devctl;
...@@ -1093,7 +1093,7 @@ static int brcmf_sdbrcm_htclk(dhd_bus_t *bus, bool on, bool pendok) ...@@ -1093,7 +1093,7 @@ static int brcmf_sdbrcm_htclk(dhd_bus_t *bus, bool on, bool pendok)
} }
/* Change idle/active SD state */ /* Change idle/active SD state */
static int brcmf_sdbrcm_sdclk(dhd_bus_t *bus, bool on) static int brcmf_sdbrcm_sdclk(struct brcmf_bus *bus, bool on)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -1106,7 +1106,7 @@ static int brcmf_sdbrcm_sdclk(dhd_bus_t *bus, bool on) ...@@ -1106,7 +1106,7 @@ static int brcmf_sdbrcm_sdclk(dhd_bus_t *bus, bool on)
} }
/* Transition SD and backplane clock readiness */ /* Transition SD and backplane clock readiness */
static int brcmf_sdbrcm_clkctl(dhd_bus_t *bus, uint target, bool pendok) static int brcmf_sdbrcm_clkctl(struct brcmf_bus *bus, uint target, bool pendok)
{ {
#ifdef BCMDBG #ifdef BCMDBG
uint oldstate = bus->clkstate; uint oldstate = bus->clkstate;
...@@ -1162,7 +1162,7 @@ static int brcmf_sdbrcm_clkctl(dhd_bus_t *bus, uint target, bool pendok) ...@@ -1162,7 +1162,7 @@ static int brcmf_sdbrcm_clkctl(dhd_bus_t *bus, uint target, bool pendok)
return 0; return 0;
} }
int brcmf_sdbrcm_bussleep(dhd_bus_t *bus, bool sleep) int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
{ {
struct brcmf_sdio_card *card = bus->card; struct brcmf_sdio_card *card = bus->card;
struct sdpcmd_regs *regs = bus->regs; struct sdpcmd_regs *regs = bus->regs;
...@@ -1259,7 +1259,7 @@ int brcmf_sdbrcm_bussleep(dhd_bus_t *bus, bool sleep) ...@@ -1259,7 +1259,7 @@ int brcmf_sdbrcm_bussleep(dhd_bus_t *bus, bool sleep)
/* Writes a HW/SW header into the packet and sends it. */ /* Writes a HW/SW header into the packet and sends it. */
/* Assumes: (a) header space already there, (b) caller holds lock */ /* Assumes: (a) header space already there, (b) caller holds lock */
static int brcmf_sdbrcm_txpkt(dhd_bus_t *bus, struct sk_buff *pkt, uint chan, static int brcmf_sdbrcm_txpkt(struct brcmf_bus *bus, struct sk_buff *pkt, uint chan,
bool free_pkt) bool free_pkt)
{ {
int ret; int ret;
...@@ -1411,7 +1411,7 @@ static int brcmf_sdbrcm_txpkt(dhd_bus_t *bus, struct sk_buff *pkt, uint chan, ...@@ -1411,7 +1411,7 @@ static int brcmf_sdbrcm_txpkt(dhd_bus_t *bus, struct sk_buff *pkt, uint chan,
return ret; return ret;
} }
int brcmf_sdbrcm_bus_txdata(struct dhd_bus *bus, struct sk_buff *pkt) int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
{ {
int ret = -EBADE; int ret = -EBADE;
uint datalen, prec; uint datalen, prec;
...@@ -1509,7 +1509,7 @@ int brcmf_sdbrcm_bus_txdata(struct dhd_bus *bus, struct sk_buff *pkt) ...@@ -1509,7 +1509,7 @@ int brcmf_sdbrcm_bus_txdata(struct dhd_bus *bus, struct sk_buff *pkt)
return ret; return ret;
} }
static uint brcmf_sdbrcm_sendfromq(dhd_bus_t *bus, uint maxframes) static uint brcmf_sdbrcm_sendfromq(struct brcmf_bus *bus, uint maxframes)
{ {
struct sk_buff *pkt; struct sk_buff *pkt;
u32 intstatus = 0; u32 intstatus = 0;
...@@ -1570,7 +1570,7 @@ static uint brcmf_sdbrcm_sendfromq(dhd_bus_t *bus, uint maxframes) ...@@ -1570,7 +1570,7 @@ static uint brcmf_sdbrcm_sendfromq(dhd_bus_t *bus, uint maxframes)
} }
int int
brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
{ {
u8 *frame; u8 *frame;
u16 len; u16 len;
...@@ -1731,7 +1731,7 @@ brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) ...@@ -1731,7 +1731,7 @@ brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
return ret ? -EIO : 0; return ret ? -EIO : 0;
} }
int brcmf_sdbrcm_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) int brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen)
{ {
int timeleft; int timeleft;
uint rxlen = 0; uint rxlen = 0;
...@@ -1888,7 +1888,7 @@ dhd_dump_pct(struct brcmu_strbuf *strbuf, char *desc, uint num, uint div) ...@@ -1888,7 +1888,7 @@ dhd_dump_pct(struct brcmu_strbuf *strbuf, char *desc, uint num, uint div)
void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, struct brcmu_strbuf *strbuf) void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, struct brcmu_strbuf *strbuf)
{ {
dhd_bus_t *bus = drvr->bus; struct brcmf_bus *bus = drvr->bus;
brcmu_bprintf(strbuf, "Bus SDIO structure:\n"); brcmu_bprintf(strbuf, "Bus SDIO structure:\n");
brcmu_bprintf(strbuf, brcmu_bprintf(strbuf,
...@@ -1986,9 +1986,9 @@ void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, struct brcmu_strbuf *strbuf) ...@@ -1986,9 +1986,9 @@ void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, struct brcmu_strbuf *strbuf)
bus->sleeping); bus->sleeping);
} }
void dhd_bus_clearcounts(struct brcmf_pub *drvr) void brcmf_bus_clearcounts(struct brcmf_pub *drvr)
{ {
dhd_bus_t *bus = (dhd_bus_t *) drvr->bus; struct brcmf_bus *bus = (struct brcmf_bus *) drvr->bus;
bus->intrcount = bus->lastintrs = bus->spurious = bus->regfails = 0; bus->intrcount = bus->lastintrs = bus->spurious = bus->regfails = 0;
bus->rxrtx = bus->rx_toolong = bus->rxc_errors = 0; bus->rxrtx = bus->rx_toolong = bus->rxc_errors = 0;
...@@ -1999,7 +1999,7 @@ void dhd_bus_clearcounts(struct brcmf_pub *drvr) ...@@ -1999,7 +1999,7 @@ void dhd_bus_clearcounts(struct brcmf_pub *drvr)
} }
#ifdef SDTEST #ifdef SDTEST
static int brcmf_sdbrcm_pktgen_get(dhd_bus_t *bus, u8 *arg) static int brcmf_sdbrcm_pktgen_get(struct brcmf_bus *bus, u8 *arg)
{ {
brcmf_pktgen_t pktgen; brcmf_pktgen_t pktgen;
...@@ -2021,7 +2021,7 @@ static int brcmf_sdbrcm_pktgen_get(dhd_bus_t *bus, u8 *arg) ...@@ -2021,7 +2021,7 @@ static int brcmf_sdbrcm_pktgen_get(dhd_bus_t *bus, u8 *arg)
return 0; return 0;
} }
static int brcmf_sdbrcm_pktgen_set(dhd_bus_t *bus, u8 *arg) static int brcmf_sdbrcm_pktgen_set(struct brcmf_bus *bus, u8 *arg)
{ {
brcmf_pktgen_t pktgen; brcmf_pktgen_t pktgen;
uint oldcnt, oldmode; uint oldcnt, oldmode;
...@@ -2055,7 +2055,7 @@ static int brcmf_sdbrcm_pktgen_set(dhd_bus_t *bus, u8 *arg) ...@@ -2055,7 +2055,7 @@ static int brcmf_sdbrcm_pktgen_set(dhd_bus_t *bus, u8 *arg)
#endif /* SDTEST */ #endif /* SDTEST */
static int static int
brcmf_sdbrcm_membytes(dhd_bus_t *bus, bool write, u32 address, u8 *data, brcmf_sdbrcm_membytes(struct brcmf_bus *bus, bool write, u32 address, u8 *data,
uint size) uint size)
{ {
int bcmerror = 0; int bcmerror = 0;
...@@ -2116,7 +2116,7 @@ brcmf_sdbrcm_membytes(dhd_bus_t *bus, bool write, u32 address, u8 *data, ...@@ -2116,7 +2116,7 @@ brcmf_sdbrcm_membytes(dhd_bus_t *bus, bool write, u32 address, u8 *data,
} }
#ifdef BCMDBG #ifdef BCMDBG
static int brcmf_sdbrcm_readshared(dhd_bus_t *bus, struct sdpcm_shared *sh) static int brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh)
{ {
u32 addr; u32 addr;
int rv; int rv;
...@@ -2168,7 +2168,7 @@ static int brcmf_sdbrcm_readshared(dhd_bus_t *bus, struct sdpcm_shared *sh) ...@@ -2168,7 +2168,7 @@ static int brcmf_sdbrcm_readshared(dhd_bus_t *bus, struct sdpcm_shared *sh)
return 0; return 0;
} }
static int brcmf_sdbrcm_checkdied(dhd_bus_t *bus, u8 *data, uint size) static int brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, u8 *data, uint size)
{ {
int bcmerror = 0; int bcmerror = 0;
uint msize = 512; uint msize = 512;
...@@ -2297,7 +2297,7 @@ static int brcmf_sdbrcm_checkdied(dhd_bus_t *bus, u8 *data, uint size) ...@@ -2297,7 +2297,7 @@ static int brcmf_sdbrcm_checkdied(dhd_bus_t *bus, u8 *data, uint size)
return bcmerror; return bcmerror;
} }
static int brcmf_sdbrcm_mem_dump(dhd_bus_t *bus) static int brcmf_sdbrcm_mem_dump(struct brcmf_bus *bus)
{ {
int ret = 0; int ret = 0;
int size; /* Full mem size */ int size; /* Full mem size */
...@@ -2346,7 +2346,7 @@ static int brcmf_sdbrcm_mem_dump(dhd_bus_t *bus) ...@@ -2346,7 +2346,7 @@ static int brcmf_sdbrcm_mem_dump(dhd_bus_t *bus)
#define CONSOLE_LINE_MAX 192 #define CONSOLE_LINE_MAX 192
static int brcmf_sdbrcm_readconsole(dhd_bus_t *bus) static int brcmf_sdbrcm_readconsole(struct brcmf_bus *bus)
{ {
struct dhd_console *c = &bus->console; struct dhd_console *c = &bus->console;
u8 line[CONSOLE_LINE_MAX], ch; u8 line[CONSOLE_LINE_MAX], ch;
...@@ -2423,7 +2423,7 @@ static int brcmf_sdbrcm_readconsole(dhd_bus_t *bus) ...@@ -2423,7 +2423,7 @@ static int brcmf_sdbrcm_readconsole(dhd_bus_t *bus)
} }
#endif /* BCMDBG */ #endif /* BCMDBG */
int brcmf_sdbrcm_downloadvars(dhd_bus_t *bus, void *arg, int len) int brcmf_sdbrcm_downloadvars(struct brcmf_bus *bus, void *arg, int len)
{ {
int bcmerror = 0; int bcmerror = 0;
...@@ -2457,7 +2457,7 @@ int brcmf_sdbrcm_downloadvars(dhd_bus_t *bus, void *arg, int len) ...@@ -2457,7 +2457,7 @@ int brcmf_sdbrcm_downloadvars(dhd_bus_t *bus, void *arg, int len)
} }
static int static int
brcmf_sdbrcm_doiovar(dhd_bus_t *bus, const struct brcmu_iovar *vi, u32 actionid, brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, const struct brcmu_iovar *vi, u32 actionid,
const char *name, void *params, int plen, void *arg, int len, const char *name, void *params, int plen, void *arg, int len,
int val_size) int val_size)
{ {
...@@ -2900,7 +2900,7 @@ brcmf_sdbrcm_doiovar(dhd_bus_t *bus, const struct brcmu_iovar *vi, u32 actionid, ...@@ -2900,7 +2900,7 @@ brcmf_sdbrcm_doiovar(dhd_bus_t *bus, const struct brcmu_iovar *vi, u32 actionid,
return bcmerror; return bcmerror;
} }
static int brcmf_sdbrcm_write_vars(dhd_bus_t *bus) static int brcmf_sdbrcm_write_vars(struct brcmf_bus *bus)
{ {
int bcmerror = 0; int bcmerror = 0;
u32 varsize; u32 varsize;
...@@ -2987,7 +2987,7 @@ static int brcmf_sdbrcm_write_vars(dhd_bus_t *bus) ...@@ -2987,7 +2987,7 @@ static int brcmf_sdbrcm_write_vars(dhd_bus_t *bus)
return bcmerror; return bcmerror;
} }
static int brcmf_sdbrcm_download_state(dhd_bus_t *bus, bool enter) static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
{ {
uint retries; uint retries;
u32 regdata; u32 regdata;
...@@ -3044,7 +3044,7 @@ int ...@@ -3044,7 +3044,7 @@ int
brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name, brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name,
void *params, int plen, void *arg, int len, bool set) void *params, int plen, void *arg, int len, bool set)
{ {
dhd_bus_t *bus = drvr->bus; struct brcmf_bus *bus = drvr->bus;
const struct brcmu_iovar *vi = NULL; const struct brcmu_iovar *vi = NULL;
int bcmerror = 0; int bcmerror = 0;
int val_size; int val_size;
...@@ -3129,7 +3129,7 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name, ...@@ -3129,7 +3129,7 @@ brcmf_sdbrcm_bus_iovar_op(struct brcmf_pub *drvr, const char *name,
return bcmerror; return bcmerror;
} }
void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex) void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)
{ {
u32 local_hostintmask; u32 local_hostintmask;
u8 saveclk; u8 saveclk;
...@@ -3218,7 +3218,7 @@ void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex) ...@@ -3218,7 +3218,7 @@ void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
{ {
dhd_bus_t *bus = drvr->bus; struct brcmf_bus *bus = drvr->bus;
struct brcmf_timeout tmo; struct brcmf_timeout tmo;
uint retries = 0; uint retries = 0;
u8 ready, enable; u8 ready, enable;
...@@ -3344,7 +3344,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) ...@@ -3344,7 +3344,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
return ret; return ret;
} }
static void brcmf_sdbrcm_rxfail(dhd_bus_t *bus, bool abort, bool rtx) static void brcmf_sdbrcm_rxfail(struct brcmf_bus *bus, bool abort, bool rtx)
{ {
struct brcmf_sdio_card *card = bus->card; struct brcmf_sdio_card *card = bus->card;
struct sdpcmd_regs *regs = bus->regs; struct sdpcmd_regs *regs = bus->regs;
...@@ -3408,7 +3408,7 @@ static void brcmf_sdbrcm_rxfail(dhd_bus_t *bus, bool abort, bool rtx) ...@@ -3408,7 +3408,7 @@ static void brcmf_sdbrcm_rxfail(dhd_bus_t *bus, bool abort, bool rtx)
} }
static void static void
brcmf_sdbrcm_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff) brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)
{ {
struct brcmf_sdio_card *card = bus->card; struct brcmf_sdio_card *card = bus->card;
uint rdlen, pad; uint rdlen, pad;
...@@ -3513,7 +3513,7 @@ brcmf_sdbrcm_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff) ...@@ -3513,7 +3513,7 @@ brcmf_sdbrcm_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff)
brcmf_os_ioctl_resp_wake(bus->drvr); brcmf_os_ioctl_resp_wake(bus->drvr);
} }
static u8 brcmf_sdbrcm_rxglom(dhd_bus_t *bus, u8 rxseq) static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
{ {
u16 dlen, totlen; u16 dlen, totlen;
u8 *dptr, num = 0; u8 *dptr, num = 0;
...@@ -3916,7 +3916,7 @@ static u8 brcmf_sdbrcm_rxglom(dhd_bus_t *bus, u8 rxseq) ...@@ -3916,7 +3916,7 @@ static u8 brcmf_sdbrcm_rxglom(dhd_bus_t *bus, u8 rxseq)
/* Return true if there may be more frames to read */ /* Return true if there may be more frames to read */
static uint static uint
brcmf_sdbrcm_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) brcmf_sdbrcm_readframes(struct brcmf_bus *bus, uint maxframes, bool *finished)
{ {
struct brcmf_sdio_card *card = bus->card; struct brcmf_sdio_card *card = bus->card;
...@@ -4512,7 +4512,7 @@ brcmf_sdbrcm_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) ...@@ -4512,7 +4512,7 @@ brcmf_sdbrcm_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
return rxcount; return rxcount;
} }
static u32 brcmf_sdbrcm_hostmail(dhd_bus_t *bus) static u32 brcmf_sdbrcm_hostmail(struct brcmf_bus *bus)
{ {
struct sdpcmd_regs *regs = bus->regs; struct sdpcmd_regs *regs = bus->regs;
u32 intstatus = 0; u32 intstatus = 0;
...@@ -4586,7 +4586,7 @@ static u32 brcmf_sdbrcm_hostmail(dhd_bus_t *bus) ...@@ -4586,7 +4586,7 @@ static u32 brcmf_sdbrcm_hostmail(dhd_bus_t *bus)
return intstatus; return intstatus;
} }
static bool brcmf_sdbrcm_dpc(dhd_bus_t *bus) static bool brcmf_sdbrcm_dpc(struct brcmf_bus *bus)
{ {
struct brcmf_sdio_card *card = bus->card; struct brcmf_sdio_card *card = bus->card;
struct sdpcmd_regs *regs = bus->regs; struct sdpcmd_regs *regs = bus->regs;
...@@ -4842,7 +4842,7 @@ static bool brcmf_sdbrcm_dpc(dhd_bus_t *bus) ...@@ -4842,7 +4842,7 @@ static bool brcmf_sdbrcm_dpc(dhd_bus_t *bus)
void brcmf_sdbrcm_isr(void *arg) void brcmf_sdbrcm_isr(void *arg)
{ {
dhd_bus_t *bus = (dhd_bus_t *) arg; struct brcmf_bus *bus = (struct brcmf_bus *) arg;
struct brcmf_sdio_card *card; struct brcmf_sdio_card *card;
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -4889,7 +4889,7 @@ void brcmf_sdbrcm_isr(void *arg) ...@@ -4889,7 +4889,7 @@ void brcmf_sdbrcm_isr(void *arg)
} }
#ifdef SDTEST #ifdef SDTEST
static void brcmf_sdbrcm_pktgen_init(dhd_bus_t *bus) static void brcmf_sdbrcm_pktgen_init(struct brcmf_bus *bus)
{ {
/* Default to specified length, or full range */ /* Default to specified length, or full range */
if (brcmf_pktgen_len) { if (brcmf_pktgen_len) {
...@@ -4912,7 +4912,7 @@ static void brcmf_sdbrcm_pktgen_init(dhd_bus_t *bus) ...@@ -4912,7 +4912,7 @@ static void brcmf_sdbrcm_pktgen_init(dhd_bus_t *bus)
bus->pktgen_stop = 1; bus->pktgen_stop = 1;
} }
static void brcmf_sdbrcm_pktgen(dhd_bus_t *bus) static void brcmf_sdbrcm_pktgen(struct brcmf_bus *bus)
{ {
struct sk_buff *pkt; struct sk_buff *pkt;
u8 *data; u8 *data;
...@@ -5020,7 +5020,7 @@ static void brcmf_sdbrcm_pktgen(dhd_bus_t *bus) ...@@ -5020,7 +5020,7 @@ static void brcmf_sdbrcm_pktgen(dhd_bus_t *bus)
} }
} }
static void brcmf_sdbrcm_sdtest_set(dhd_bus_t *bus, bool start) static void brcmf_sdbrcm_sdtest_set(struct brcmf_bus *bus, bool start)
{ {
struct sk_buff *pkt; struct sk_buff *pkt;
u8 *data; u8 *data;
...@@ -5047,7 +5047,7 @@ static void brcmf_sdbrcm_sdtest_set(dhd_bus_t *bus, bool start) ...@@ -5047,7 +5047,7 @@ static void brcmf_sdbrcm_sdtest_set(dhd_bus_t *bus, bool start)
} }
static void static void
brcmf_sdbrcm_checkdied(dhd_bus_t *bus, struct sk_buff *pkt, uint seq) brcmf_sdbrcm_checkdied(struct brcmf_bus *bus, struct sk_buff *pkt, uint seq)
{ {
u8 *data; u8 *data;
uint pktlen; uint pktlen;
...@@ -5151,7 +5151,7 @@ brcmf_sdbrcm_checkdied(dhd_bus_t *bus, struct sk_buff *pkt, uint seq) ...@@ -5151,7 +5151,7 @@ brcmf_sdbrcm_checkdied(dhd_bus_t *bus, struct sk_buff *pkt, uint seq)
extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr) extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
{ {
dhd_bus_t *bus; struct brcmf_bus *bus;
DHD_TIMER(("%s: Enter\n", __func__)); DHD_TIMER(("%s: Enter\n", __func__));
...@@ -5250,7 +5250,7 @@ extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr) ...@@ -5250,7 +5250,7 @@ extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
static int brcmf_sdbrcm_bus_console_in(struct brcmf_pub *drvr, static int brcmf_sdbrcm_bus_console_in(struct brcmf_pub *drvr,
unsigned char *msg, uint msglen) unsigned char *msg, uint msglen)
{ {
dhd_bus_t *bus = drvr->bus; struct brcmf_bus *bus = drvr->bus;
u32 addr, val; u32 addr, val;
int rv; int rv;
struct sk_buff *pkt; struct sk_buff *pkt;
...@@ -5328,7 +5328,7 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no, ...@@ -5328,7 +5328,7 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no,
void *card) void *card)
{ {
int ret; int ret;
dhd_bus_t *bus; struct brcmf_bus *bus;
/* Init global variables at run-time, not as part of the declaration. /* Init global variables at run-time, not as part of the declaration.
* This is required to support init/de-init of the driver. * This is required to support init/de-init of the driver.
...@@ -5402,9 +5402,9 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no, ...@@ -5402,9 +5402,9 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no,
} }
/* Allocate private bus interface state */ /* Allocate private bus interface state */
bus = kzalloc(sizeof(dhd_bus_t), GFP_ATOMIC); bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
if (!bus) { if (!bus) {
DHD_ERROR(("%s: kmalloc of dhd_bus_t failed\n", __func__)); DHD_ERROR(("%s: kmalloc of struct dhd_bus failed\n", __func__));
goto fail; goto fail;
} }
bus->card = card; bus->card = card;
...@@ -5521,7 +5521,7 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no, ...@@ -5521,7 +5521,7 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no,
} }
static bool static bool
brcmf_sdbrcm_probe_attach(struct dhd_bus *bus, void *card, void *regsva, brcmf_sdbrcm_probe_attach(struct brcmf_bus *bus, void *card, void *regsva,
u16 devid) u16 devid)
{ {
u8 clkctl = 0; u8 clkctl = 0;
...@@ -5614,7 +5614,7 @@ brcmf_sdbrcm_probe_attach(struct dhd_bus *bus, void *card, void *regsva, ...@@ -5614,7 +5614,7 @@ brcmf_sdbrcm_probe_attach(struct dhd_bus *bus, void *card, void *regsva,
return false; return false;
} }
static bool brcmf_sdbrcm_probe_malloc(dhd_bus_t *bus, void *card) static bool brcmf_sdbrcm_probe_malloc(struct brcmf_bus *bus, void *card)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5654,7 +5654,7 @@ static bool brcmf_sdbrcm_probe_malloc(dhd_bus_t *bus, void *card) ...@@ -5654,7 +5654,7 @@ static bool brcmf_sdbrcm_probe_malloc(dhd_bus_t *bus, void *card)
return false; return false;
} }
static bool brcmf_sdbrcm_probe_init(dhd_bus_t *bus, void *card) static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus, void *card)
{ {
s32 fnum; s32 fnum;
...@@ -5711,7 +5711,7 @@ static bool brcmf_sdbrcm_probe_init(dhd_bus_t *bus, void *card) ...@@ -5711,7 +5711,7 @@ static bool brcmf_sdbrcm_probe_init(dhd_bus_t *bus, void *card)
} }
static bool static bool
brcmf_sdbrcm_download_firmware(struct dhd_bus *bus, void *card) brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus, void *card)
{ {
bool ret; bool ret;
...@@ -5726,7 +5726,7 @@ brcmf_sdbrcm_download_firmware(struct dhd_bus *bus, void *card) ...@@ -5726,7 +5726,7 @@ brcmf_sdbrcm_download_firmware(struct dhd_bus *bus, void *card)
} }
/* Detach and free everything */ /* Detach and free everything */
static void brcmf_sdbrcm_release(dhd_bus_t *bus) static void brcmf_sdbrcm_release(struct brcmf_bus *bus)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5749,7 +5749,7 @@ static void brcmf_sdbrcm_release(dhd_bus_t *bus) ...@@ -5749,7 +5749,7 @@ static void brcmf_sdbrcm_release(dhd_bus_t *bus)
DHD_TRACE(("%s: Disconnected\n", __func__)); DHD_TRACE(("%s: Disconnected\n", __func__));
} }
static void brcmf_sdbrcm_release_malloc(dhd_bus_t *bus) static void brcmf_sdbrcm_release_malloc(struct brcmf_bus *bus)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5764,7 +5764,7 @@ static void brcmf_sdbrcm_release_malloc(dhd_bus_t *bus) ...@@ -5764,7 +5764,7 @@ static void brcmf_sdbrcm_release_malloc(dhd_bus_t *bus)
bus->databuf = NULL; bus->databuf = NULL;
} }
static void brcmf_sdbrcm_release_dongle(dhd_bus_t *bus) static void brcmf_sdbrcm_release_dongle(struct brcmf_bus *bus)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5785,7 +5785,7 @@ static void brcmf_sdbrcm_release_dongle(dhd_bus_t *bus) ...@@ -5785,7 +5785,7 @@ static void brcmf_sdbrcm_release_dongle(dhd_bus_t *bus)
static void brcmf_sdbrcm_disconnect(void *ptr) static void brcmf_sdbrcm_disconnect(void *ptr)
{ {
dhd_bus_t *bus = (dhd_bus_t *)ptr; struct brcmf_bus *bus = (struct brcmf_bus *)ptr;
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5807,7 +5807,7 @@ static struct brcmf_sdioh_driver dhd_sdio = { ...@@ -5807,7 +5807,7 @@ static struct brcmf_sdioh_driver dhd_sdio = {
brcmf_sdbrcm_disconnect brcmf_sdbrcm_disconnect
}; };
int dhd_bus_register(void) int brcmf_bus_register(void)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -5829,14 +5829,14 @@ int dhd_bus_register(void) ...@@ -5829,14 +5829,14 @@ int dhd_bus_register(void)
return brcmf_sdio_register(&dhd_sdio); return brcmf_sdio_register(&dhd_sdio);
} }
void dhd_bus_unregister(void) void brcmf_bus_unregister(void)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
brcmf_sdio_unregister(); brcmf_sdio_unregister();
} }
static int brcmf_sdbrcm_download_code_file(struct dhd_bus *bus) static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus)
{ {
int offset = 0; int offset = 0;
uint len; uint len;
...@@ -5938,7 +5938,7 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len) ...@@ -5938,7 +5938,7 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)
return buf_len; return buf_len;
} }
static int brcmf_sdbrcm_download_nvram(struct dhd_bus *bus) static int brcmf_sdbrcm_download_nvram(struct brcmf_bus *bus)
{ {
uint len; uint len;
char *memblock = NULL; char *memblock = NULL;
...@@ -5990,7 +5990,7 @@ static int brcmf_sdbrcm_download_nvram(struct dhd_bus *bus) ...@@ -5990,7 +5990,7 @@ static int brcmf_sdbrcm_download_nvram(struct dhd_bus *bus)
return ret; return ret;
} }
static int _brcmf_sdbrcm_download_firmware(struct dhd_bus *bus) static int _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
{ {
int bcmerror = -1; int bcmerror = -1;
...@@ -6033,7 +6033,7 @@ static int _brcmf_sdbrcm_download_firmware(struct dhd_bus *bus) ...@@ -6033,7 +6033,7 @@ static int _brcmf_sdbrcm_download_firmware(struct dhd_bus *bus)
static int static int
brcmf_sdbrcm_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn, uint flags,
u8 *buf, uint nbytes, struct sk_buff *pkt, u8 *buf, uint nbytes, struct sk_buff *pkt,
brcmf_sdio_cmplt_fn_t complete, void *handle) brcmf_sdio_cmplt_fn_t complete, void *handle)
{ {
...@@ -6042,23 +6042,23 @@ brcmf_sdbrcm_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags, ...@@ -6042,23 +6042,23 @@ brcmf_sdbrcm_send_buf(dhd_bus_t *bus, u32 addr, uint fn, uint flags,
handle); handle);
} }
uint dhd_bus_chip(struct dhd_bus *bus) uint brcmf_bus_chip(struct brcmf_bus *bus)
{ {
ASSERT(bus->ci != NULL); ASSERT(bus->ci != NULL);
return bus->ci->chip; return bus->ci->chip;
} }
void *dhd_bus_pub(struct dhd_bus *bus) void *brcmf_bus_drvr(struct brcmf_bus *bus)
{ {
return bus->drvr; return bus->drvr;
} }
void *dhd_bus_txq(struct dhd_bus *bus) void *brcmf_bus_txq(struct brcmf_bus *bus)
{ {
return &bus->txq; return &bus->txq;
} }
uint dhd_bus_hdrlen(struct dhd_bus *bus) uint brcmf_bus_hdrlen(struct brcmf_bus *bus)
{ {
return SDPCM_HDRLEN; return SDPCM_HDRLEN;
} }
...@@ -6066,7 +6066,7 @@ uint dhd_bus_hdrlen(struct dhd_bus *bus) ...@@ -6066,7 +6066,7 @@ uint dhd_bus_hdrlen(struct dhd_bus *bus)
int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag) int brcmf_bus_devreset(struct brcmf_pub *drvr, u8 flag)
{ {
int bcmerror = 0; int bcmerror = 0;
dhd_bus_t *bus; struct brcmf_bus *bus;
bus = drvr->bus; bus = drvr->bus;
...@@ -6265,7 +6265,7 @@ brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_card *card, u32 corebase) ...@@ -6265,7 +6265,7 @@ brcmf_sdbrcm_chip_disablecore(struct brcmf_sdio_card *card, u32 corebase)
} }
static int static int
brcmf_sdbrcm_chip_attach(struct dhd_bus *bus, void *regs) brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, void *regs)
{ {
struct chip_info *ci; struct chip_info *ci;
int err; int err;
...@@ -6448,7 +6448,7 @@ static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = { ...@@ -6448,7 +6448,7 @@ static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = {
#define SDIOD_DRVSTR_KEY(chip, pmu) (((chip) << 16) | (pmu)) #define SDIOD_DRVSTR_KEY(chip, pmu) (((chip) << 16) | (pmu))
static void static void
brcmf_sdbrcm_sdiod_drive_strength_init(struct dhd_bus *bus, u32 drivestrength) { brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus, u32 drivestrength) {
struct sdiod_drive_str *str_tab = NULL; struct sdiod_drive_str *str_tab = NULL;
u32 str_mask = 0; u32 str_mask = 0;
u32 str_shift = 0; u32 str_shift = 0;
...@@ -6512,7 +6512,7 @@ brcmf_sdbrcm_sdiod_drive_strength_init(struct dhd_bus *bus, u32 drivestrength) { ...@@ -6512,7 +6512,7 @@ brcmf_sdbrcm_sdiod_drive_strength_init(struct dhd_bus *bus, u32 drivestrength) {
} }
static void static void
brcmf_sdbrcm_chip_detach(struct dhd_bus *bus) brcmf_sdbrcm_chip_detach(struct brcmf_bus *bus)
{ {
DHD_TRACE(("%s: Enter\n", __func__)); DHD_TRACE(("%s: Enter\n", __func__));
...@@ -6521,7 +6521,7 @@ brcmf_sdbrcm_chip_detach(struct dhd_bus *bus) ...@@ -6521,7 +6521,7 @@ brcmf_sdbrcm_chip_detach(struct dhd_bus *bus)
} }
static void static void
brcmf_sdbrcm_wait_for_event(dhd_bus_t *bus, bool *lockvar) brcmf_sdbrcm_wait_for_event(struct brcmf_bus *bus, bool *lockvar)
{ {
brcmf_sdbrcm_sdunlock(bus); brcmf_sdbrcm_sdunlock(bus);
wait_event_interruptible_timeout(bus->ctrl_wait, wait_event_interruptible_timeout(bus->ctrl_wait,
...@@ -6531,7 +6531,7 @@ brcmf_sdbrcm_wait_for_event(dhd_bus_t *bus, bool *lockvar) ...@@ -6531,7 +6531,7 @@ brcmf_sdbrcm_wait_for_event(dhd_bus_t *bus, bool *lockvar)
} }
static void static void
brcmf_sdbrcm_wait_event_wakeup(dhd_bus_t *bus) brcmf_sdbrcm_wait_event_wakeup(struct brcmf_bus *bus)
{ {
if (waitqueue_active(&bus->ctrl_wait)) if (waitqueue_active(&bus->ctrl_wait))
wake_up_interruptible(&bus->ctrl_wait); wake_up_interruptible(&bus->ctrl_wait);
...@@ -6541,7 +6541,7 @@ brcmf_sdbrcm_wait_event_wakeup(dhd_bus_t *bus) ...@@ -6541,7 +6541,7 @@ brcmf_sdbrcm_wait_event_wakeup(dhd_bus_t *bus)
static int static int
brcmf_sdbrcm_watchdog_thread(void *data) brcmf_sdbrcm_watchdog_thread(void *data)
{ {
dhd_bus_t *bus = (dhd_bus_t *)data; struct brcmf_bus *bus = (struct brcmf_bus *)data;
/* This thread doesn't need any user-level access, /* This thread doesn't need any user-level access,
* so get rid of all our resources * so get rid of all our resources
...@@ -6572,7 +6572,7 @@ brcmf_sdbrcm_watchdog_thread(void *data) ...@@ -6572,7 +6572,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
static void static void
brcmf_sdbrcm_watchdog(unsigned long data) brcmf_sdbrcm_watchdog(unsigned long data)
{ {
dhd_bus_t *bus = (dhd_bus_t *)data; struct brcmf_bus *bus = (struct brcmf_bus *)data;
if (brcmf_watchdog_prio >= 0) { if (brcmf_watchdog_prio >= 0) {
if (bus->watchdog_tsk) if (bus->watchdog_tsk)
...@@ -6592,7 +6592,7 @@ brcmf_sdbrcm_watchdog(unsigned long data) ...@@ -6592,7 +6592,7 @@ brcmf_sdbrcm_watchdog(unsigned long data)
} }
void void
brcmf_sdbrcm_wd_timer(struct dhd_bus *bus, uint wdtick) brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
{ {
static uint save_ms; static uint save_ms;
...@@ -6636,7 +6636,7 @@ brcmf_sdbrcm_wd_timer(struct dhd_bus *bus, uint wdtick) ...@@ -6636,7 +6636,7 @@ brcmf_sdbrcm_wd_timer(struct dhd_bus *bus, uint wdtick)
static int brcmf_sdbrcm_dpc_thread(void *data) static int brcmf_sdbrcm_dpc_thread(void *data)
{ {
dhd_bus_t *bus = (dhd_bus_t *) data; struct brcmf_bus *bus = (struct brcmf_bus *) data;
/* This thread doesn't need any user-level access, /* This thread doesn't need any user-level access,
* so get rid of all our resources * so get rid of all our resources
...@@ -6670,7 +6670,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data) ...@@ -6670,7 +6670,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
static void brcmf_sdbrcm_dpc_tasklet(unsigned long data) static void brcmf_sdbrcm_dpc_tasklet(unsigned long data)
{ {
dhd_bus_t *bus = (dhd_bus_t *) data; struct brcmf_bus *bus = (struct brcmf_bus *) data;
/* Call bus dpc unless it indicated down (then clean stop) */ /* Call bus dpc unless it indicated down (then clean stop) */
if (bus->drvr->busstate != DHD_BUS_DOWN) { if (bus->drvr->busstate != DHD_BUS_DOWN) {
...@@ -6680,7 +6680,7 @@ static void brcmf_sdbrcm_dpc_tasklet(unsigned long data) ...@@ -6680,7 +6680,7 @@ static void brcmf_sdbrcm_dpc_tasklet(unsigned long data)
brcmf_sdbrcm_bus_stop(bus, true); brcmf_sdbrcm_bus_stop(bus, true);
} }
static void brcmf_sdbrcm_sched_dpc(dhd_bus_t *bus) static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus)
{ {
if (bus->dpc_tsk) { if (bus->dpc_tsk) {
complete(&bus->dpc_wait); complete(&bus->dpc_wait);
...@@ -6690,7 +6690,7 @@ static void brcmf_sdbrcm_sched_dpc(dhd_bus_t *bus) ...@@ -6690,7 +6690,7 @@ static void brcmf_sdbrcm_sched_dpc(dhd_bus_t *bus)
tasklet_schedule(&bus->tasklet); tasklet_schedule(&bus->tasklet);
} }
static void brcmf_sdbrcm_sdlock(dhd_bus_t *bus) static void brcmf_sdbrcm_sdlock(struct brcmf_bus *bus)
{ {
if (bus->threads_only) if (bus->threads_only)
down(&bus->sdsem); down(&bus->sdsem);
...@@ -6698,7 +6698,7 @@ static void brcmf_sdbrcm_sdlock(dhd_bus_t *bus) ...@@ -6698,7 +6698,7 @@ static void brcmf_sdbrcm_sdlock(dhd_bus_t *bus)
spin_lock_bh(&bus->sdlock); spin_lock_bh(&bus->sdlock);
} }
static void brcmf_sdbrcm_sdunlock(dhd_bus_t *bus) static void brcmf_sdbrcm_sdunlock(struct brcmf_bus *bus)
{ {
if (bus->threads_only) if (bus->threads_only)
up(&bus->sdsem); up(&bus->sdsem);
...@@ -6706,7 +6706,7 @@ static void brcmf_sdbrcm_sdunlock(dhd_bus_t *bus) ...@@ -6706,7 +6706,7 @@ static void brcmf_sdbrcm_sdunlock(dhd_bus_t *bus)
spin_unlock_bh(&bus->sdlock); spin_unlock_bh(&bus->sdlock);
} }
static int brcmf_sdbrcm_get_image(char *buf, int len, struct dhd_bus *bus) static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)
{ {
if (bus->firmware->size < bus->fw_ptr + len) if (bus->firmware->size < bus->fw_ptr + len)
len = bus->firmware->size - bus->fw_ptr; len = bus->firmware->size - bus->fw_ptr;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7