Skip to content

Commit

Permalink
staging/rtl8192e: Fix compile warning 'is static but declared in .. w…
Browse files Browse the repository at this point in the history
…hich is not static'

When compiling this driver I get these compile warnings:

rtllib.h:2573:2: warning: '______f' is static but declared in inline
function 'rtllib_is_empty_essid' which is not static [enabled by
default]
rtllib.h:2579:3: warning: '______f' is static but declared in inline
function 'rtllib_is_empty_essid' which is not static [enabled by
default]
rtllib.h:2594:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2599:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2604:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2618:3: warning: '______f' is static but declared in inline
function 'rtllib_get_hdrlen' which is not static [enabled by default]
rtllib.h:2620:3: warning: '______f' is static but declared in inline
function 'rtllib_get_hdrlen' which is not static [enabled by default]

These functions are declared as extern inline but not 'overloaded'
anywhere so we can declare them static inline and get rid of the
warnings.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Oct 29, 2012
1 parent 53f63dc commit 9d8a20a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/rtl8192e/rtllib.h
Original file line number Diff line number Diff line change
Expand Up @@ -2567,7 +2567,7 @@ static inline void *rtllib_priv(struct net_device *dev)
return ((struct rtllib_device *)netdev_priv(dev))->priv;
}

extern inline int rtllib_is_empty_essid(const char *essid, int essid_len)
static inline int rtllib_is_empty_essid(const char *essid, int essid_len)
{
/* Single white space is for Linksys APs */
if (essid_len == 1 && essid[0] == ' ')
Expand All @@ -2583,7 +2583,7 @@ extern inline int rtllib_is_empty_essid(const char *essid, int essid_len)
return 1;
}

extern inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
static inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
{
/*
* It is possible for both access points and our device to support
Expand All @@ -2609,7 +2609,7 @@ extern inline int rtllib_is_valid_mode(struct rtllib_device *ieee, int mode)
return 0;
}

extern inline int rtllib_get_hdrlen(u16 fc)
static inline int rtllib_get_hdrlen(u16 fc)
{
int hdrlen = RTLLIB_3ADDR_LEN;

Expand Down

0 comments on commit 9d8a20a

Please sign in to comment.