forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brcmfmac: get rid of some void pointer parameters

Browse source 
In sdio code a couple of functions use a void pointer as argument
type although it should be struct brcmf_sdio. Changing the functions
to have proper type checking.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel 2013-12-12 11:58:56 +01:00 • committed by John W. Linville
commit 964ec1cfeb
2 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View file

@ -3649,10 +3649,8 @@ exit:
return ret; return ret;
} }
void brcmf_sdbrcm_isr(void *arg) void brcmf_sdbrcm_isr(struct brcmf_sdio *bus)
{ {
struct brcmf_sdio *bus = (struct brcmf_sdio *) arg;
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
if (!bus) { if (!bus) {
@ -4037,7 +4035,7 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = {
.gettxq = brcmf_sdbrcm_bus_gettxq, .gettxq = brcmf_sdbrcm_bus_gettxq,
}; };
void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev) struct brcmf_sdio *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev)
{ {
int ret; int ret;
struct brcmf_sdio *bus; struct brcmf_sdio *bus;
@ -4147,13 +4145,10 @@ fail:
return NULL; return NULL;
} }
void brcmf_sdbrcm_disconnect(void *ptr) void brcmf_sdbrcm_disconnect(struct brcmf_sdio *bus)
{ {
struct brcmf_sdio *bus = (struct brcmf_sdio *)ptr;
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
if (bus)
brcmf_sdbrcm_release(bus); brcmf_sdbrcm_release(bus);
brcmf_dbg(TRACE, "Disconnected\n"); brcmf_dbg(TRACE, "Disconnected\n");

9
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
View file

@ -165,7 +165,7 @@ struct brcmf_sdio_dev {
struct sdio_func *func[SDIO_MAX_FUNCS]; struct sdio_func *func[SDIO_MAX_FUNCS];
u8 num_funcs; /* Supported funcs on client */ u8 num_funcs; /* Supported funcs on client */
u32 sbwad; /* Save backplane window address */ u32 sbwad; /* Save backplane window address */
void *bus; struct brcmf_sdio *bus;
atomic_t suspend; /* suspend flag */ atomic_t suspend; /* suspend flag */
wait_queue_head_t request_byte_wait; wait_queue_head_t request_byte_wait;
wait_queue_head_t request_word_wait; wait_queue_head_t request_word_wait;
@ -239,10 +239,9 @@ int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
/* Issue an abort to the specified function */ /* Issue an abort to the specified function */
int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn); int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev); struct brcmf_sdio *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev);
void brcmf_sdbrcm_disconnect(void *ptr); void brcmf_sdbrcm_disconnect(struct brcmf_sdio *bus);
void brcmf_sdbrcm_isr(void *arg); void brcmf_sdbrcm_isr(struct brcmf_sdio *bus);
void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick); void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);
#endif /* _BRCM_SDH_H_ */ #endif /* _BRCM_SDH_H_ */