staging: rtl8192e: Pass r8192_priv to eprom_read

Signed-off-by: Mike McCormack <mikem@ring3k.org>
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 ba4712f482a5b408e8e16b6ca2685f30f737db1c..55d4f56dc42e58c211703981069e913d107abf06 100644 (file)
--- a/drivers/staging/rtl8192e/r8180_93cx6.c
+++ b/drivers/staging/rtl8192e/r8180_93cx6.c
@@ -82,9 +82,8 @@ static void eprom_send_bits_string(struct r8192_priv *priv, short b[], int len)
 }
 
 
-u32 eprom_read(struct net_device *dev, u32 addr)
+u32 eprom_read(struct r8192_priv *priv, u32 addr)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        short read_cmd[] = {1, 1, 0};
        short addr_str[8];
        int i;

diff --git a/drivers/staging/rtl8192e/r8180_93cx6.h b/drivers/staging/rtl8192e/r8180_93cx6.h
index 4c3f675c6a662f5aaa96fc997de8953c8a15b5d6..55d20544a9c9ae85e0ba94f09dcf85bf11c00a0d 100644 (file)
--- a/drivers/staging/rtl8192e/r8180_93cx6.h
+++ b/drivers/staging/rtl8192e/r8180_93cx6.h
@@ -38,4 +38,4 @@
 #define EPROM_TXPW1 0x3d
 
 /* Reads a 16 bits word. */
-u32 eprom_read(struct net_device *dev, u32 addr);
+u32 eprom_read(struct r8192_priv *priv, u32 addr);

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index fbbede29b0307eaec4773eb1899b222296ea8d32..950089864aae2acfa04a0dc0a5214cbc6be0bb29 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -2092,7 +2092,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
        // TODO: I don't know if we need to apply EF function to EEPROM read function
 
        //2 Read EEPROM ID to make sure autoload is success
-       EEPROMId = eprom_read(dev, 0);
+       EEPROMId = eprom_read(priv, 0);
        if( EEPROMId != RTL8190_EEPROM_ID )
        {
                RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n", EEPROMId, RTL8190_EEPROM_ID);
@@ -2110,12 +2110,12 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
        if(!priv->AutoloadFailFlag)
        {
                // VID, PID
-               priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1));
-               priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1));
+               priv->eeprom_vid = eprom_read(priv, (EEPROM_VID >> 1));
+               priv->eeprom_did = eprom_read(priv, (EEPROM_DID >> 1));
 
-               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8 ;
+               usValue = eprom_read(priv, (u16)(EEPROM_Customer_ID>>1)) >> 8 ;
                priv->eeprom_CustomerID = (u8)( usValue & 0xff);
-               usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1));
+               usValue = eprom_read(priv, (EEPROM_ICVersion_ChannelPlan>>1));
                priv->eeprom_ChannelPlan = usValue&0xff;
                IC_Version = ((usValue&0xff00)>>8);
 
@@ -2159,7 +2159,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
        {
                for(i = 0; i < 6; i += 2)
                {
-                       usValue = eprom_read(dev, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1));
+                       usValue = eprom_read(priv, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1));
                        *(u16*)(&dev->dev_addr[i]) = usValue;
                }
        } else {
@@ -2185,7 +2185,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
                // Read RF-indication and Tx Power gain index diff of legacy to HT OFDM rate.
                if(!priv->AutoloadFailFlag)
                {
-                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
+                       tempval = (eprom_read(priv, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
                        priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;        // bit[3:0]
 
                        if (tempval&0x80)       //RF-indication, bit[7]
@@ -2203,7 +2203,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
                // Read ThermalMeter from EEPROM
                if(!priv->AutoloadFailFlag)
                {
-                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8);
+                       priv->EEPROMThermalMeter = (u8)(((eprom_read(priv, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8);
                }
                else
                {
@@ -2218,7 +2218,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
                // Read antenna tx power offset of B/C/D to A and CrystalCap from EEPROM
                if(!priv->AutoloadFailFlag)
                {
-                               usValue = eprom_read(dev, (EEPROM_TxPwDiff_CrystalCap>>1));
+                               usValue = eprom_read(priv, (EEPROM_TxPwDiff_CrystalCap>>1));
                                priv->EEPROMAntPwDiff = (usValue&0x0fff);
                                priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12);
                }
@@ -2237,7 +2237,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
                {
                        if(!priv->AutoloadFailFlag)
                        {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
+                               usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
                        }
                        else
                        {
@@ -2251,7 +2251,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
                {
                        if(!priv->AutoloadFailFlag)
                        {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) );
+                               usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) );
                        }
                        else
                        {