Staging: rtl8192e: fix lots of sparse warnings

This removes a number of static and extern warnings that sparse
complains about.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/r8180_93cx6.c b/drivers/staging/rtl8192e/r8180_93cx6.c
index 838ee35..79f7a0f 100644 (file)
--- a/drivers/staging/rtl8192e/r8180_93cx6.c
+++ b/drivers/staging/rtl8192e/r8180_93cx6.c
@@ -20,7 +20,7 @@
 
 #include "r8180_93cx6.h"
 
-void eprom_cs(struct net_device *dev, short bit)
+static void eprom_cs(struct net_device *dev, short bit)
 {
        if(bit)
                write_nic_byte(dev, EPROM_CMD,
@@ -35,7 +35,7 @@ void eprom_cs(struct net_device *dev, short bit)
 }
 
 
-void eprom_ck_cycle(struct net_device *dev)
+static void eprom_ck_cycle(struct net_device *dev)
 {
        write_nic_byte(dev, EPROM_CMD,
                       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev,EPROM_CMD));
@@ -48,7 +48,7 @@ void eprom_ck_cycle(struct net_device *dev)
 }
 
 
-void eprom_w(struct net_device *dev,short bit)
+static void eprom_w(struct net_device *dev,short bit)
 {
        if(bit)
                write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
@@ -62,7 +62,7 @@ void eprom_w(struct net_device *dev,short bit)
 }
 
 
-short eprom_r(struct net_device *dev)
+static short eprom_r(struct net_device *dev)
 {
        short bit;
 
@@ -74,7 +74,7 @@ short eprom_r(struct net_device *dev)
 }
 
 
-void eprom_send_bits_string(struct net_device *dev, short b[], int len)
+static void eprom_send_bits_string(struct net_device *dev, short b[], int len)
 {
        int i;
 

diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c
index da628c5..0eaee3a 100644 (file)
--- a/drivers/staging/rtl8192e/r8190_rtl8256.c
+++ b/drivers/staging/rtl8192e/r8190_rtl8256.c
@@ -418,7 +418,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel)
 }
 
 #define MAX_DOZE_WAITING_TIMES_9x 64
-bool
+static bool
 SetRFPowerState8190(
        struct net_device* dev,
        RT_RF_POWER_STATE       eRFPowerState
@@ -717,7 +717,7 @@ SetRFPowerState8190(
 //
 //     050823, by rcnjko.
 //
-bool
+static bool
 SetRFPowerState(
        struct net_device* dev,
        RT_RF_POWER_STATE       eRFPowerState
@@ -745,7 +745,7 @@ SetRFPowerState(
        return bResult;
 }
 
-void
+static void
 MgntDisconnectIBSS(
        struct net_device* dev
 )
@@ -823,7 +823,7 @@ MgntDisconnectIBSS(
 
 }
 
-void
+static void
 MlmeDisassociateRequest(
        struct net_device* dev,
        u8*             asSta,
@@ -837,7 +837,7 @@ MlmeDisassociateRequest(
 
        SendDisassociation( priv->ieee80211, asSta, asRsn );
 
-       if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == 0)
+       if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == NULL)
        {
                //ShuChen TODO: change media status.
                //ShuChen TODO: What to do when disassociate.
@@ -891,7 +891,7 @@ MlmeDisassociateRequest(
 }
 
 
-void
+static void
 MgntDisconnectAP(
        struct net_device* dev,
        u8 asRsn
@@ -945,7 +945,7 @@ MgntDisconnectAP(
 }
 
 
-bool
+static bool
 MgntDisconnect(
        struct net_device* dev,
        u8 asRsn

diff --cc drivers/staging/rtl8192e/r8192E_core.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_dm.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_wx.c
Simple merge

diff --cc drivers/staging/rtl8192e/r819xE_cmdpkt.c
Simple merge

diff --cc drivers/staging/rtl8192e/r819xE_firmware.c
Simple merge

diff --cc drivers/staging/rtl8192e/r819xE_firmware_img.h
Simple merge

diff --cc drivers/staging/rtl8192e/r819xE_phy.c
Simple merge