aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/sys
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 12:40:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 12:40:02 -0400
commit2d956e2221929103031f217fd666a10edd05f3a0 (patch)
treefcd3cc867dec997b97adb18cdd164e43211cf993 /drivers/staging/brcm80211/sys
parent2a0b139283935f01faea6e24d8def3c844f8fe1d (diff)
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r--drivers/staging/brcm80211/sys/wlc_ampdu.c2
-rw-r--r--drivers/staging/brcm80211/sys/wlc_bmac.c2
-rw-r--r--drivers/staging/brcm80211/sys/wlc_mac80211.c2
-rw-r--r--drivers/staging/brcm80211/sys/wlc_pub.h6
-rw-r--r--drivers/staging/brcm80211/sys/wlc_rpc.h6
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index ab97628348f..acba739193c 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -158,7 +158,7 @@ static void wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb,
158 uint32 frmtxstatus, 158 uint32 frmtxstatus,
159 uint32 frmtxstatus2); 159 uint32 frmtxstatus2);
160 160
161static INLINE uint16 pkt_txh_seqnum(wlc_info_t *wlc, void *p) 161static inline uint16 pkt_txh_seqnum(wlc_info_t *wlc, void *p)
162{ 162{
163 d11txh_t *txh; 163 d11txh_t *txh;
164 struct dot11_header *h; 164 struct dot11_header *h;
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index e17d01bb921..73c610b53e9 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -3174,7 +3174,7 @@ void wlc_bmac_tx_fifo_resume(wlc_hw_info_t *wlc_hw, uint tx_fifo)
3174 * 0 if the interrupt is not for us, or we are in some special cases; 3174 * 0 if the interrupt is not for us, or we are in some special cases;
3175 * device interrupt status bits otherwise. 3175 * device interrupt status bits otherwise.
3176 */ 3176 */
3177static INLINE uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr) 3177static inline uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
3178{ 3178{
3179 wlc_hw_info_t *wlc_hw = wlc->hw; 3179 wlc_hw_info_t *wlc_hw = wlc->hw;
3180 d11regs_t *regs = wlc_hw->regs; 3180 d11regs_t *regs = wlc_hw->regs;
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 1af6d91a22e..59e32bc8a35 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -5441,7 +5441,7 @@ void BCMFASTPATH wlc_send_q(wlc_info_t *wlc, wlc_txq_info_t *qi)
5441 * Generate frame ID for a BCMC packet. The frag field is not used 5441 * Generate frame ID for a BCMC packet. The frag field is not used
5442 * for MC frames so is used as part of the sequence number. 5442 * for MC frames so is used as part of the sequence number.
5443 */ 5443 */
5444static INLINE uint16 5444static inline uint16
5445bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh) 5445bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
5446{ 5446{
5447 uint16 frameid; 5447 uint16 frameid;
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 6cc884cbbb3..4354aef26ce 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -569,19 +569,19 @@ extern uint16 wlc_rate_shm_offset(struct wlc_info *wlc, uint8 rate);
569extern uint32 wlc_get_rspec_history(struct wlc_bsscfg *cfg); 569extern uint32 wlc_get_rspec_history(struct wlc_bsscfg *cfg);
570extern uint32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg); 570extern uint32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg);
571 571
572static INLINE int wlc_iovar_getuint(struct wlc_info *wlc, const char *name, 572static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
573 uint *arg) 573 uint *arg)
574{ 574{
575 return wlc_iovar_getint(wlc, name, (int *)arg); 575 return wlc_iovar_getint(wlc, name, (int *)arg);
576} 576}
577 577
578static INLINE int wlc_iovar_getuint8(struct wlc_info *wlc, const char *name, 578static inline int wlc_iovar_getuint8(struct wlc_info *wlc, const char *name,
579 uint8 *arg) 579 uint8 *arg)
580{ 580{
581 return wlc_iovar_getint8(wlc, name, (int8 *) arg); 581 return wlc_iovar_getint8(wlc, name, (int8 *) arg);
582} 582}
583 583
584static INLINE int wlc_iovar_setuint(struct wlc_info *wlc, const char *name, 584static inline int wlc_iovar_setuint(struct wlc_info *wlc, const char *name,
585 uint arg) 585 uint arg)
586{ 586{
587 return wlc_iovar_setint(wlc, name, (int)arg); 587 return wlc_iovar_setint(wlc, name, (int)arg);
diff --git a/drivers/staging/brcm80211/sys/wlc_rpc.h b/drivers/staging/brcm80211/sys/wlc_rpc.h
index b582c104b29..666b8b31691 100644
--- a/drivers/staging/brcm80211/sys/wlc_rpc.h
+++ b/drivers/staging/brcm80211/sys/wlc_rpc.h
@@ -420,7 +420,7 @@ typedef struct wlc_rpc_ctx {
420 wlc_hw_info_t *wlc_hw; 420 wlc_hw_info_t *wlc_hw;
421} wlc_rpc_ctx_t; 421} wlc_rpc_ctx_t;
422 422
423static INLINE rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b, 423static inline rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b,
424 uint len, wlc_rpc_id_t rpc_id) 424 uint len, wlc_rpc_id_t rpc_id)
425{ 425{
426 rpc_buf_t *rpc_buf; 426 rpc_buf_t *rpc_buf;
@@ -496,7 +496,7 @@ typedef struct wlc_rpc_txstatus {
496 uint32 ackphyrxsh_phyerr; 496 uint32 ackphyrxsh_phyerr;
497} wlc_rpc_txstatus_t; 497} wlc_rpc_txstatus_t;
498 498
499static INLINE 499static inline
500 void txstatus2rpc_txstatus(tx_status_t *txstatus, 500 void txstatus2rpc_txstatus(tx_status_t *txstatus,
501 wlc_rpc_txstatus_t *rpc_txstatus) 501 wlc_rpc_txstatus_t *rpc_txstatus)
502{ 502{
@@ -509,7 +509,7 @@ static INLINE
509 (txstatus->ackphyrxsh << 16) | txstatus->phyerr; 509 (txstatus->ackphyrxsh << 16) | txstatus->phyerr;
510} 510}
511 511
512static INLINE 512static inline
513 void rpc_txstatus2txstatus(wlc_rpc_txstatus_t *rpc_txstatus, 513 void rpc_txstatus2txstatus(wlc_rpc_txstatus_t *rpc_txstatus,
514 tx_status_t *txstatus) 514 tx_status_t *txstatus)
515{ 515{