Commit 964ec1cf authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: get rid of some void pointer parameters 



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: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4744d164

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+4 −9
Original line number Diff line number Diff line
@@ -3649,10 +3649,8 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) 
	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");



	if (!bus) {
@@ -4037,7 +4035,7 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = { 
	.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;

	struct brcmf_sdio *bus;
@@ -4147,13 +4145,10 @@ void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev) 
	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");



	if (bus)

	brcmf_sdbrcm_release(bus);



	brcmf_dbg(TRACE, "Disconnected\n");

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

+4 −5
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct brcmf_sdio_dev { 
	struct sdio_func *func[SDIO_MAX_FUNCS];

	u8 num_funcs;			/* Supported funcs on client */

	u32 sbwad;			/* Save backplane window address */

	void *bus;

	struct brcmf_sdio *bus;

	atomic_t suspend;		/* suspend flag */

	wait_queue_head_t request_byte_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 */

int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);



void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev);

void brcmf_sdbrcm_disconnect(void *ptr);

void brcmf_sdbrcm_isr(void *arg);



struct brcmf_sdio *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev);

void brcmf_sdbrcm_disconnect(struct brcmf_sdio *bus);

void brcmf_sdbrcm_isr(struct brcmf_sdio *bus);

void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);



#endif				/* _BRCM_SDH_H_ */