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

Commit 412e4fdf authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove brcmu_bprintf and related functions 



The functions brcmu_bprintf and brcmu_binit could be replaced by
snprintf kernel function. These are no longer used in both brcm80211
drivers so they have been removed.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 67064f27

drivers/staging/brcm80211/brcmsmac/types.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -329,7 +329,6 @@ struct ieee80211_tx_queue_params; 
struct brcms_info;

struct brcms_info;

struct brcms_c_info;

struct brcms_c_info;

struct brcms_hardware;

struct brcms_hardware;

struct brcmu_strbuf;

struct brcms_txq_info;

struct brcms_txq_info;

struct brcms_band;

struct brcms_band;

struct dma_pub;

struct dma_pub;

drivers/staging/brcm80211/brcmutil/utils.c

+0 −34
Original line number Original line Diff line number Diff line
@@ -598,37 +598,3 @@ uint brcmu_bitcount(u8 *bitmap, uint length) 
	return bitcount;

	return bitcount;

}

}

EXPORT_SYMBOL(brcmu_bitcount);
 
EXPORT_SYMBOL(brcmu_bitcount);
 


/* Initialization of brcmu_strbuf structure */

void brcmu_binit(struct brcmu_strbuf *b, char *buf, uint size)

{

	b->origsize = b->size = size;

	b->origbuf = b->buf = buf;

}

EXPORT_SYMBOL(brcmu_binit);



/* Buffer sprintf wrapper to guard against buffer overflow */

int brcmu_bprintf(struct brcmu_strbuf *b, const char *fmt, ...)

{

	va_list ap;

	int r;



	va_start(ap, fmt);

	r = vsnprintf(b->buf, b->size, fmt, ap);



	/* Non Ansi C99 compliant returns -1,

	 * Ansi compliant return r >= b->size,

	 * stdlib returns 0, handle all

	 */

	if ((r == -1) || (r >= (int)b->size) || (r == 0)) {

		b->size = 0;

	} else {

		b->size -= r;

		b->buf += r;

	}



	va_end(ap);



	return r;

}

EXPORT_SYMBOL(brcmu_bprintf);

drivers/staging/brcm80211/include/brcmu_utils.h

+0 −15
Original line number Original line Diff line number Diff line
@@ -19,18 +19,6 @@ 




#include <linux/skbuff.h>

#include <linux/skbuff.h>





/* Buffer structure for collecting string-formatted data

* using brcmu_bprintf() API.

* Use brcmu_binit() to initialize before use

*/



struct brcmu_strbuf {

	char *buf;	/* pointer to current position in origbuf */

	unsigned int size;	/* current (residual) size in bytes */

	char *origbuf;	/* unmodified pointer to orignal buffer */

	unsigned int origsize;	/* unmodified orignal buffer size in bytes */

};



/*

/*

 * Spin at most 'us' microseconds while 'exp' is true.

 * Spin at most 'us' microseconds while 'exp' is true.

 * Caller should explicitly test 'exp' when this completes

 * Caller should explicitly test 'exp' when this completes
@@ -228,9 +216,6 @@ extern struct brcmu_tlv *brcmu_parse_tlvs(void *buf, int buflen, 
extern u16 brcmu_qdbm_to_mw(u8 qdbm);

extern u16 brcmu_qdbm_to_mw(u8 qdbm);

extern u8 brcmu_mw_to_qdbm(u16 mw);

extern u8 brcmu_mw_to_qdbm(u16 mw);





extern void brcmu_binit(struct brcmu_strbuf *b, char *buf, uint size);

extern int brcmu_bprintf(struct brcmu_strbuf *b, const char *fmt, ...);



extern uint brcmu_mkiovar(char *name, char *data, uint datalen,

extern uint brcmu_mkiovar(char *name, char *data, uint datalen,

			  char *buf, uint len);

			  char *buf, uint len);

extern uint brcmu_bitcount(u8 *bitmap, uint bytelength);

extern uint brcmu_bitcount(u8 *bitmap, uint bytelength);