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

Commit 2d956e22 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: remove INLINE definition 



Use the "real" inline marking for functions.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2a0b1392

drivers/staging/brcm80211/include/bcmendian.h

+12 −12
Original line number Diff line number Diff line
@@ -201,17 +201,17 @@ 
#else				/* !__GNUC__ */



/* Inline versions avoid referencing the argument multiple times */

static INLINE uint16 bcmswap16(uint16 val)

static inline uint16 bcmswap16(uint16 val)

{

	return BCMSWAP16(val);

}



static INLINE uint32 bcmswap32(uint32 val)

static inline uint32 bcmswap32(uint32 val)

{

	return BCMSWAP32(val);

}



static INLINE uint32 bcmswap32by16(uint32 val)

static inline uint32 bcmswap32by16(uint32 val)

{

	return BCMSWAP32BY16(val);

}
@@ -219,7 +219,7 @@ static INLINE uint32 bcmswap32by16(uint32 val) 
/* Reverse pairs of bytes in a buffer (not for high-performance use) */

/* buf	- start of buffer of shorts to swap */

/* len  - byte length of buffer */

static INLINE void bcmswap16_buf(uint16 *buf, uint len)

static inline void bcmswap16_buf(uint16 *buf, uint len)

{

	len = len / 2;
@@ -232,7 +232,7 @@ static INLINE void bcmswap16_buf(uint16 *buf, uint len) 
/*

 * Store 16-bit value to unaligned little-endian byte array.

 */

static INLINE void htol16_ua_store(uint16 val, uint8 *bytes)

static inline void htol16_ua_store(uint16 val, uint8 *bytes)

{

	bytes[0] = val & 0xff;

	bytes[1] = val >> 8;
@@ -241,7 +241,7 @@ static INLINE void htol16_ua_store(uint16 val, uint8 *bytes) 
/*

 * Store 32-bit value to unaligned little-endian byte array.

 */

static INLINE void htol32_ua_store(uint32 val, uint8 *bytes)

static inline void htol32_ua_store(uint32 val, uint8 *bytes)

{

	bytes[0] = val & 0xff;

	bytes[1] = (val >> 8) & 0xff;
@@ -252,7 +252,7 @@ static INLINE void htol32_ua_store(uint32 val, uint8 *bytes) 
/*

 * Store 16-bit value to unaligned network-(big-)endian byte array.

 */

static INLINE void hton16_ua_store(uint16 val, uint8 *bytes)

static inline void hton16_ua_store(uint16 val, uint8 *bytes)

{

	bytes[0] = val >> 8;

	bytes[1] = val & 0xff;
@@ -261,7 +261,7 @@ static INLINE void hton16_ua_store(uint16 val, uint8 *bytes) 
/*

 * Store 32-bit value to unaligned network-(big-)endian byte array.

 */

static INLINE void hton32_ua_store(uint32 val, uint8 *bytes)

static inline void hton32_ua_store(uint32 val, uint8 *bytes)

{

	bytes[0] = val >> 24;

	bytes[1] = (val >> 16) & 0xff;
@@ -272,7 +272,7 @@ static INLINE void hton32_ua_store(uint32 val, uint8 *bytes) 
/*

 * Load 16-bit value from unaligned little-endian byte array.

 */

static INLINE uint16 ltoh16_ua(const void *bytes)

static inline uint16 ltoh16_ua(const void *bytes)

{

	return _LTOH16_UA((const uint8 *)bytes);

}
@@ -280,7 +280,7 @@ static INLINE uint16 ltoh16_ua(const void *bytes) 
/*

 * Load 32-bit value from unaligned little-endian byte array.

 */

static INLINE uint32 ltoh32_ua(const void *bytes)

static inline uint32 ltoh32_ua(const void *bytes)

{

	return _LTOH32_UA((const uint8 *)bytes);

}
@@ -288,7 +288,7 @@ static INLINE uint32 ltoh32_ua(const void *bytes) 
/*

 * Load 16-bit value from unaligned big-(network-)endian byte array.

 */

static INLINE uint16 ntoh16_ua(const void *bytes)

static inline uint16 ntoh16_ua(const void *bytes)

{

	return _NTOH16_UA((const uint8 *)bytes);

}
@@ -296,7 +296,7 @@ static INLINE uint16 ntoh16_ua(const void *bytes) 
/*

 * Load 32-bit value from unaligned big-(network-)endian byte array.

 */

static INLINE uint32 ntoh32_ua(const void *bytes)

static inline uint32 ntoh32_ua(const void *bytes)

{

	return _NTOH32_UA((const uint8 *)bytes);

}

drivers/staging/brcm80211/include/bcmnvram.h

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ extern int BCMINITFN(nvram_resetgpio_init) (void *sih); 
 * @return	TRUE if variable is defined and its value is string equal

 *		to match or FALSE otherwise

 */

static INLINE int nvram_match(char *name, char *match)

static inline int nvram_match(char *name, char *match)

{

	const char *value = nvram_get(name);

	return value && !strcmp(value, match);
@@ -104,7 +104,7 @@ static INLINE int nvram_match(char *name, char *match) 
 * @return	TRUE if variable is defined and its value is not string

 *		equal to invmatch or FALSE otherwise

 */

static INLINE int nvram_invmatch(char *name, char *invmatch)

static inline int nvram_invmatch(char *name, char *invmatch)

{

	const char *value = nvram_get(name);

	return value && strcmp(value, invmatch);

drivers/staging/brcm80211/include/bcmutils.h

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ extern "C" { 


/* crypto utility function */

/* 128-bit xor: *dst = *src1 xor *src2. dst1, src1 and src2 may have any alignment */

	static INLINE void

	static inline void

	 xor_128bit_block(const uint8 *src1, const uint8 *src2, uint8 *dst) {

		if (

#ifdef __i386__

drivers/staging/brcm80211/include/bitfuncs.h

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <typedefs.h>



/* local prototypes */

static INLINE uint32 find_msbit(uint32 x);

static inline uint32 find_msbit(uint32 x);



/*

 * find_msbit: returns index of most significant set bit in x, with index
@@ -35,7 +35,7 @@ static INLINE uint32 find_msbit(uint32 x); 
 * model 2, stepping 12, "Pentium 75 - 200"), so we use the generic

 * implementation instead.

 */

static INLINE uint32 find_msbit(uint32 x)

static inline uint32 find_msbit(uint32 x)

{

	uint msbit;

 __asm__("bsrl %1,%0" : "=r"(msbit)
@@ -55,7 +55,7 @@ static INLINE uint32 find_msbit(uint32 x) 
#define DB_POW_MASK2	0x0000000c

#define DB_POW_MASK1	0x00000002



static INLINE uint32 find_msbit(uint32 x)

static inline uint32 find_msbit(uint32 x)

{

	uint32 temp_x = x;

	uint msbit = 0;

drivers/staging/brcm80211/include/linux_osl.h

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ extern void *osl_pktdup(osl_t *osh, void *skb); 
extern void *osl_pktget_static(osl_t *osh, uint len);

extern void osl_pktfree_static(osl_t *osh, void *skb, bool send);



static INLINE void *

static inline void *

osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb)

{

	struct sk_buff *nskb;
@@ -377,7 +377,7 @@ osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb) 
#define PKTFRMNATIVE(osh, skb)	\

	osl_pkt_frmnative(((osl_pubinfo_t *)osh), (struct sk_buff*)(skb))



static INLINE struct sk_buff *

static inline struct sk_buff *

osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt)

{

	struct sk_buff *nskb;