Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c793822 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced typedef SDIOH_API_RC by int 



Code cleanup.

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 89650047

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+11 −13
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#define SDIOH_DATA_PIO          0	/* PIO mode */

#define SDIOH_DATA_DMA          1	/* DMA mode */



typedef int SDIOH_API_RC;



/* callback function, taking one arg */

typedef void (*sdioh_cb_fn_t) (void *);
@@ -46,17 +44,17 @@ typedef void (*sdioh_cb_fn_t) (void *); 
 *  cfghdl points to the starting address of pci device mapped memory

 */

extern struct sdioh_info *brcmf_sdioh_attach(void *cfghdl, uint irq);

extern SDIOH_API_RC brcmf_sdioh_detach(struct sdioh_info *si);

extern SDIOH_API_RC brcmf_sdioh_interrupt_register(struct sdioh_info *si,

extern int brcmf_sdioh_detach(struct sdioh_info *si);

extern int brcmf_sdioh_interrupt_register(struct sdioh_info *si,

					     sdioh_cb_fn_t fn, void *argh);

extern SDIOH_API_RC brcmf_sdioh_interrupt_deregister(struct sdioh_info *si);

extern int brcmf_sdioh_interrupt_deregister(struct sdioh_info *si);



/* query whether SD interrupt is enabled or not */

extern SDIOH_API_RC

extern int

brcmf_sdioh_interrupt_query(struct sdioh_info *si, bool *onoff);



/* enable or disable SD interrupt */

extern SDIOH_API_RC

extern int

brcmf_sdioh_interrupt_set(struct sdioh_info *si, bool enable_disable);



#if defined(DHD_DEBUG)
@@ -67,30 +65,30 @@ extern int brcmf_sdioh_claim_host_and_lock(struct sdioh_info *si); 
extern int brcmf_sdioh_release_host_and_unlock(struct sdioh_info *si);



/* read or write one byte using cmd52 */

extern SDIOH_API_RC

extern int

brcmf_sdioh_request_byte(struct sdioh_info *si, uint rw, uint fnc, uint addr,

			 u8 *byte);



/* read or write 2/4 bytes using cmd53 */

extern SDIOH_API_RC

extern int

brcmf_sdioh_request_word(struct sdioh_info *si, uint cmd_type,

			 uint rw, uint fnc, uint addr,

			 u32 *word, uint nbyte);



/* read or write any buffer using cmd53 */

extern SDIOH_API_RC

extern int

brcmf_sdioh_request_buffer(struct sdioh_info *si, uint pio_dma,

			   uint fix_inc, uint rw, uint fnc_num,

			   u32 addr, uint regwidth,

			   u32 buflen, u8 *buffer, struct sk_buff *pkt);



/* get cis data */

extern SDIOH_API_RC

extern int

brcmf_sdioh_cis_read(struct sdioh_info *si, uint fuc, u8 *cis, u32 length);



extern SDIOH_API_RC

extern int

brcmf_sdioh_cfg_read(struct sdioh_info *si, uint fuc, u32 addr, u8 *data);

extern SDIOH_API_RC

extern int

brcmf_sdioh_cfg_write(struct sdioh_info *si, uint fuc, u32 addr, u8 *data);



/* query number of io functions */

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+15 −15
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ brcmf_sdcard_iovar_op(void *sdh, const char *name, 
bool brcmf_sdcard_intr_query(void *sdh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	bool on;



	ASSERT(bcmsdh);
@@ -123,7 +123,7 @@ bool brcmf_sdcard_intr_query(void *sdh) 
int brcmf_sdcard_intr_enable(void *sdh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	ASSERT(bcmsdh);



	status = brcmf_sdioh_interrupt_set(bcmsdh->sdioh, true);
@@ -133,7 +133,7 @@ int brcmf_sdcard_intr_enable(void *sdh) 
int brcmf_sdcard_intr_disable(void *sdh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	ASSERT(bcmsdh);



	status = brcmf_sdioh_interrupt_set(bcmsdh->sdioh, false);
@@ -143,7 +143,7 @@ int brcmf_sdcard_intr_disable(void *sdh) 
int brcmf_sdcard_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	ASSERT(bcmsdh);



	status = brcmf_sdioh_interrupt_register(bcmsdh->sdioh, fn, argh);
@@ -153,7 +153,7 @@ int brcmf_sdcard_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) 
int brcmf_sdcard_intr_dereg(void *sdh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	ASSERT(bcmsdh);



	status = brcmf_sdioh_interrupt_deregister(bcmsdh->sdioh);
@@ -181,7 +181,7 @@ int brcmf_sdcard_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) 
u8 brcmf_sdcard_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

#ifdef SDIOH_API_ACCESS_RETRY_LIMIT

	s32 retry = 0;

#endif
@@ -217,7 +217,7 @@ void 
brcmf_sdcard_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

#ifdef SDIOH_API_ACCESS_RETRY_LIMIT

	s32 retry = 0;

#endif
@@ -249,7 +249,7 @@ brcmf_sdcard_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err) 
u32 brcmf_sdcard_cfg_read_word(void *sdh, uint fnc_num, u32 addr, int *err)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	u32 data = 0;



	if (!bcmsdh)
@@ -274,7 +274,7 @@ brcmf_sdcard_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data, 
		      int *err)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;



	if (!bcmsdh)

		bcmsdh = l_bcmsdh;
@@ -295,7 +295,7 @@ brcmf_sdcard_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data, 
int brcmf_sdcard_cis_read(void *sdh, uint func, u8 * cis, uint length)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;



	u8 *tmp_buf, *tmp_ptr;

	u8 *ptr;
@@ -355,7 +355,7 @@ static int brcmf_sdcard_set_sbaddr_window(void *sdh, u32 address) 
u32 brcmf_sdcard_reg_read(void *sdh, u32 addr, uint size)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	u32 word = 0;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
@@ -408,7 +408,7 @@ u32 brcmf_sdcard_reg_read(void *sdh, u32 addr, uint size) 
u32 brcmf_sdcard_reg_write(void *sdh, u32 addr, uint size, u32 data)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	int err = 0;
@@ -454,7 +454,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio *bcmsdh, u32 addr, uint fn, uint flags, 
		u8 *buf, uint nbytes, struct sk_buff *pkt,

		bcmsdh_cmplt_fn_t complete, void *handle)

{

	SDIOH_API_RC status;

	int status;

	uint incr_fix;

	uint width;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
@@ -498,7 +498,7 @@ brcmf_sdcard_send_buf(void *sdh, u32 addr, uint fn, uint flags, 
		bcmsdh_cmplt_fn_t complete, void *handle)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;

	uint incr_fix;

	uint width;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
@@ -539,7 +539,7 @@ brcmf_sdcard_send_buf(void *sdh, u32 addr, uint fn, uint flags, 
int brcmf_sdcard_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

	SDIOH_API_RC status;

	int status;



	ASSERT(bcmsdh);

	ASSERT(bcmsdh->init_success);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+18 −18
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct sdioh_info *brcmf_sdioh_attach(void *bar0, uint irq) 
	return sd;

}



extern SDIOH_API_RC brcmf_sdioh_detach(struct sdioh_info *sd)

extern int brcmf_sdioh_detach(struct sdioh_info *sd)

{

	sd_trace(("%s\n", __func__));
@@ -193,7 +193,7 @@ extern SDIOH_API_RC brcmf_sdioh_detach(struct sdioh_info *sd) 


#if defined(OOB_INTR_ONLY) && defined(HW_OOB)



extern SDIOH_API_RC brcmf_sdioh_enable_func_intr(void)

extern int brcmf_sdioh_enable_func_intr(void)

{

	u8 reg;

	int err;
@@ -227,7 +227,7 @@ extern SDIOH_API_RC brcmf_sdioh_enable_func_intr(void) 
	return SDIOH_API_RC_SUCCESS;

}



extern SDIOH_API_RC brcmf_sdioh_disable_func_intr(void)

extern int brcmf_sdioh_disable_func_intr(void)

{

	u8 reg;

	int err;
@@ -260,7 +260,7 @@ extern SDIOH_API_RC brcmf_sdioh_disable_func_intr(void) 
#endif				/* defined(OOB_INTR_ONLY) && defined(HW_OOB) */



/* Configure callback to client when we receive client interrupt */

extern SDIOH_API_RC

extern int

brcmf_sdioh_interrupt_register(struct sdioh_info *sd, sdioh_cb_fn_t fn,

			       void *argh)

{
@@ -293,7 +293,7 @@ brcmf_sdioh_interrupt_register(struct sdioh_info *sd, sdioh_cb_fn_t fn, 
	return SDIOH_API_RC_SUCCESS;

}



extern SDIOH_API_RC brcmf_sdioh_interrupt_deregister(struct sdioh_info *sd)

extern int brcmf_sdioh_interrupt_deregister(struct sdioh_info *sd)

{

	sd_trace(("%s: Entering\n", __func__));
@@ -322,7 +322,7 @@ extern SDIOH_API_RC brcmf_sdioh_interrupt_deregister(struct sdioh_info *sd) 
	return SDIOH_API_RC_SUCCESS;

}



extern SDIOH_API_RC

extern int

brcmf_sdioh_interrupt_query(struct sdioh_info *sd, bool *onoff)

{

	sd_trace(("%s: Entering\n", __func__));
@@ -536,9 +536,9 @@ brcmf_sdioh_iovar_op(struct sdioh_info *si, const char *name, 


#if defined(OOB_INTR_ONLY) && defined(HW_OOB)



SDIOH_API_RC brcmf_sdioh_enable_hw_oob_intr(struct sdioh_info *sd, bool enable)

int brcmf_sdioh_enable_hw_oob_intr(struct sdioh_info *sd, bool enable)

{

	SDIOH_API_RC status;

	int status;

	u8 data;



	if (enable)
@@ -552,20 +552,20 @@ SDIOH_API_RC brcmf_sdioh_enable_hw_oob_intr(struct sdioh_info *sd, bool enable) 
}

#endif				/* defined(OOB_INTR_ONLY) && defined(HW_OOB) */



extern SDIOH_API_RC

extern int

brcmf_sdioh_cfg_read(struct sdioh_info *sd, uint fnc_num, u32 addr, u8 *data)

{

	SDIOH_API_RC status;

	int status;

	/* No lock needed since brcmf_sdioh_request_byte does locking */

	status = brcmf_sdioh_request_byte(sd, SDIOH_READ, fnc_num, addr, data);

	return status;

}



extern SDIOH_API_RC

extern int

brcmf_sdioh_cfg_write(struct sdioh_info *sd, uint fnc_num, u32 addr, u8 *data)

{

	/* No lock needed since brcmf_sdioh_request_byte does locking */

	SDIOH_API_RC status;

	int status;

	status = brcmf_sdioh_request_byte(sd, SDIOH_WRITE, fnc_num, addr, data);

	return status;

}
@@ -591,7 +591,7 @@ static int brcmf_sdioh_get_cisaddr(struct sdioh_info *sd, u32 regaddr) 
	return scratch;

}



extern SDIOH_API_RC

extern int

brcmf_sdioh_cis_read(struct sdioh_info *sd, uint func, u8 *cisd, u32 length)

{

	u32 count;
@@ -625,7 +625,7 @@ brcmf_sdioh_cis_read(struct sdioh_info *sd, uint func, u8 *cisd, u32 length) 
	return SDIOH_API_RC_SUCCESS;

}



extern SDIOH_API_RC

extern int

brcmf_sdioh_request_byte(struct sdioh_info *sd, uint rw, uint func,

			 uint regaddr, u8 *byte)

{
@@ -724,7 +724,7 @@ brcmf_sdioh_request_byte(struct sdioh_info *sd, uint rw, uint func, 
	return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);

}



extern SDIOH_API_RC

extern int

brcmf_sdioh_request_word(struct sdioh_info *sd, uint cmd_type, uint rw,

			 uint func, uint addr, u32 *word, uint nbytes)

{
@@ -777,7 +777,7 @@ brcmf_sdioh_request_word(struct sdioh_info *sd, uint cmd_type, uint rw, 
	return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL);

}



static SDIOH_API_RC

static int

brcmf_sdioh_request_packet(struct sdioh_info *sd, uint fix_inc, uint write,

			   uint func, uint addr, struct sk_buff *pkt)

{
@@ -873,12 +873,12 @@ brcmf_sdioh_request_packet(struct sdioh_info *sd, uint fix_inc, uint write, 
 * aligned packet.

 *

 */

extern SDIOH_API_RC

extern int

brcmf_sdioh_request_buffer(struct sdioh_info *sd, uint pio_dma, uint fix_inc,

			   uint write, uint func, uint addr, uint reg_width,

			   uint buflen_u, u8 *buffer, struct sk_buff *pkt)

{

	SDIOH_API_RC Status;

	int Status;

	struct sk_buff *mypkt = NULL;



	sd_trace(("%s: Enter\n", __func__));

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void brcmf_sdioh_osfree(struct sdioh_info *sd) 
}



/* Interrupt enable/disable */

SDIOH_API_RC brcmf_sdioh_interrupt_set(struct sdioh_info *sd, bool enable)

int brcmf_sdioh_interrupt_set(struct sdioh_info *sd, bool enable)

{

	unsigned long flags;

	struct sdos_info *sdos;