summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/sys
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:40:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:40:02 -0700
commit2d956e2221929103031f217fd666a10edd05f3a0 (patch)
treefcd3cc867dec997b97adb18cdd164e43211cf993 /drivers/staging/brcm80211/sys
parent2a0b139283935f01faea6e24d8def3c844f8fe1d (diff)
downloadop-kernel-dev-2d956e2221929103031f217fd666a10edd05f3a0.zip
op-kernel-dev-2d956e2221929103031f217fd666a10edd05f3a0.tar.gz
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 ab97628..acba739 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,
uint32 frmtxstatus,
uint32 frmtxstatus2);
-static INLINE uint16 pkt_txh_seqnum(wlc_info_t *wlc, void *p)
+static inline uint16 pkt_txh_seqnum(wlc_info_t *wlc, void *p)
{
d11txh_t *txh;
struct dot11_header *h;
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index e17d01b..73c610b 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)
* 0 if the interrupt is not for us, or we are in some special cases;
* device interrupt status bits otherwise.
*/
-static INLINE uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
+static inline uint32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
{
wlc_hw_info_t *wlc_hw = wlc->hw;
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 1af6d91..59e32bc 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)
* Generate frame ID for a BCMC packet. The frag field is not used
* for MC frames so is used as part of the sequence number.
*/
-static INLINE uint16
+static inline uint16
bcmc_fid_generate(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg, d11txh_t *txh)
{
uint16 frameid;
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 6cc884c..4354aef 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);
extern uint32 wlc_get_rspec_history(struct wlc_bsscfg *cfg);
extern uint32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg);
-static INLINE int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
+static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
uint *arg)
{
return wlc_iovar_getint(wlc, name, (int *)arg);
}
-static INLINE int wlc_iovar_getuint8(struct wlc_info *wlc, const char *name,
+static inline int wlc_iovar_getuint8(struct wlc_info *wlc, const char *name,
uint8 *arg)
{
return wlc_iovar_getint8(wlc, name, (int8 *) arg);
}
-static INLINE int wlc_iovar_setuint(struct wlc_info *wlc, const char *name,
+static inline int wlc_iovar_setuint(struct wlc_info *wlc, const char *name,
uint arg)
{
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 b582c10..666b8b3 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 {
wlc_hw_info_t *wlc_hw;
} wlc_rpc_ctx_t;
-static INLINE rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b,
+static inline rpc_buf_t *wlc_rpc_buf_alloc(rpc_info_t *rpc, bcm_xdr_buf_t *b,
uint len, wlc_rpc_id_t rpc_id)
{
rpc_buf_t *rpc_buf;
@@ -496,7 +496,7 @@ typedef struct wlc_rpc_txstatus {
uint32 ackphyrxsh_phyerr;
} wlc_rpc_txstatus_t;
-static INLINE
+static inline
void txstatus2rpc_txstatus(tx_status_t *txstatus,
wlc_rpc_txstatus_t *rpc_txstatus)
{
@@ -509,7 +509,7 @@ static INLINE
(txstatus->ackphyrxsh << 16) | txstatus->phyerr;
}
-static INLINE
+static inline
void rpc_txstatus2txstatus(wlc_rpc_txstatus_t *rpc_txstatus,
tx_status_t *txstatus)
{
OpenPOWER on IntegriCloud