diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-03-03 08:44:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 16:31:43 -0500 |
commit | 5aa68752f993b9e411196bbc44a202aadee42de2 (patch) | |
tree | 1761b2678868a407126fa31dbed7a6e72baf76be /drivers/staging/rtl8192e | |
parent | 31d664e56bb508aaa00de3952f0746dcd9d18a01 (diff) |
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>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/r8180_93cx6.c | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8180_93cx6.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 22 |
3 files changed, 13 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/r8180_93cx6.c b/drivers/staging/rtl8192e/r8180_93cx6.c index ba4712f482a..55d4f56dc42 100644 --- 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) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
85 | u32 eprom_read(struct net_device *dev, u32 addr) | 85 | u32 eprom_read(struct r8192_priv *priv, u32 addr) |
86 | { | 86 | { |
87 | struct r8192_priv *priv = ieee80211_priv(dev); | ||
88 | short read_cmd[] = {1, 1, 0}; | 87 | short read_cmd[] = {1, 1, 0}; |
89 | short addr_str[8]; | 88 | short addr_str[8]; |
90 | int i; | 89 | int i; |
diff --git a/drivers/staging/rtl8192e/r8180_93cx6.h b/drivers/staging/rtl8192e/r8180_93cx6.h index 4c3f675c6a6..55d20544a9c 100644 --- a/drivers/staging/rtl8192e/r8180_93cx6.h +++ b/drivers/staging/rtl8192e/r8180_93cx6.h | |||
@@ -38,4 +38,4 @@ | |||
38 | #define EPROM_TXPW1 0x3d | 38 | #define EPROM_TXPW1 0x3d |
39 | 39 | ||
40 | /* Reads a 16 bits word. */ | 40 | /* Reads a 16 bits word. */ |
41 | u32 eprom_read(struct net_device *dev, u32 addr); | 41 | 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 fbbede29b03..950089864aa 100644 --- 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) | |||
2092 | // TODO: I don't know if we need to apply EF function to EEPROM read function | 2092 | // TODO: I don't know if we need to apply EF function to EEPROM read function |
2093 | 2093 | ||
2094 | //2 Read EEPROM ID to make sure autoload is success | 2094 | //2 Read EEPROM ID to make sure autoload is success |
2095 | EEPROMId = eprom_read(dev, 0); | 2095 | EEPROMId = eprom_read(priv, 0); |
2096 | if( EEPROMId != RTL8190_EEPROM_ID ) | 2096 | if( EEPROMId != RTL8190_EEPROM_ID ) |
2097 | { | 2097 | { |
2098 | RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n", EEPROMId, RTL8190_EEPROM_ID); | 2098 | 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) | |||
2110 | if(!priv->AutoloadFailFlag) | 2110 | if(!priv->AutoloadFailFlag) |
2111 | { | 2111 | { |
2112 | // VID, PID | 2112 | // VID, PID |
2113 | priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1)); | 2113 | priv->eeprom_vid = eprom_read(priv, (EEPROM_VID >> 1)); |
2114 | priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1)); | 2114 | priv->eeprom_did = eprom_read(priv, (EEPROM_DID >> 1)); |
2115 | 2115 | ||
2116 | usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8 ; | 2116 | usValue = eprom_read(priv, (u16)(EEPROM_Customer_ID>>1)) >> 8 ; |
2117 | priv->eeprom_CustomerID = (u8)( usValue & 0xff); | 2117 | priv->eeprom_CustomerID = (u8)( usValue & 0xff); |
2118 | usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1)); | 2118 | usValue = eprom_read(priv, (EEPROM_ICVersion_ChannelPlan>>1)); |
2119 | priv->eeprom_ChannelPlan = usValue&0xff; | 2119 | priv->eeprom_ChannelPlan = usValue&0xff; |
2120 | IC_Version = ((usValue&0xff00)>>8); | 2120 | IC_Version = ((usValue&0xff00)>>8); |
2121 | 2121 | ||
@@ -2159,7 +2159,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2159 | { | 2159 | { |
2160 | for(i = 0; i < 6; i += 2) | 2160 | for(i = 0; i < 6; i += 2) |
2161 | { | 2161 | { |
2162 | usValue = eprom_read(dev, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1)); | 2162 | usValue = eprom_read(priv, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1)); |
2163 | *(u16*)(&dev->dev_addr[i]) = usValue; | 2163 | *(u16*)(&dev->dev_addr[i]) = usValue; |
2164 | } | 2164 | } |
2165 | } else { | 2165 | } else { |
@@ -2185,7 +2185,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2185 | // Read RF-indication and Tx Power gain index diff of legacy to HT OFDM rate. | 2185 | // Read RF-indication and Tx Power gain index diff of legacy to HT OFDM rate. |
2186 | if(!priv->AutoloadFailFlag) | 2186 | if(!priv->AutoloadFailFlag) |
2187 | { | 2187 | { |
2188 | tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff>>1))) & 0xff; | 2188 | tempval = (eprom_read(priv, (EEPROM_RFInd_PowerDiff>>1))) & 0xff; |
2189 | priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf; // bit[3:0] | 2189 | priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf; // bit[3:0] |
2190 | 2190 | ||
2191 | if (tempval&0x80) //RF-indication, bit[7] | 2191 | if (tempval&0x80) //RF-indication, bit[7] |
@@ -2203,7 +2203,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2203 | // Read ThermalMeter from EEPROM | 2203 | // Read ThermalMeter from EEPROM |
2204 | if(!priv->AutoloadFailFlag) | 2204 | if(!priv->AutoloadFailFlag) |
2205 | { | 2205 | { |
2206 | priv->EEPROMThermalMeter = (u8)(((eprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8); | 2206 | priv->EEPROMThermalMeter = (u8)(((eprom_read(priv, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8); |
2207 | } | 2207 | } |
2208 | else | 2208 | else |
2209 | { | 2209 | { |
@@ -2218,7 +2218,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2218 | // Read antenna tx power offset of B/C/D to A and CrystalCap from EEPROM | 2218 | // Read antenna tx power offset of B/C/D to A and CrystalCap from EEPROM |
2219 | if(!priv->AutoloadFailFlag) | 2219 | if(!priv->AutoloadFailFlag) |
2220 | { | 2220 | { |
2221 | usValue = eprom_read(dev, (EEPROM_TxPwDiff_CrystalCap>>1)); | 2221 | usValue = eprom_read(priv, (EEPROM_TxPwDiff_CrystalCap>>1)); |
2222 | priv->EEPROMAntPwDiff = (usValue&0x0fff); | 2222 | priv->EEPROMAntPwDiff = (usValue&0x0fff); |
2223 | priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12); | 2223 | priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12); |
2224 | } | 2224 | } |
@@ -2237,7 +2237,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2237 | { | 2237 | { |
2238 | if(!priv->AutoloadFailFlag) | 2238 | if(!priv->AutoloadFailFlag) |
2239 | { | 2239 | { |
2240 | usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) ); | 2240 | usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) ); |
2241 | } | 2241 | } |
2242 | else | 2242 | else |
2243 | { | 2243 | { |
@@ -2251,7 +2251,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2251 | { | 2251 | { |
2252 | if(!priv->AutoloadFailFlag) | 2252 | if(!priv->AutoloadFailFlag) |
2253 | { | 2253 | { |
2254 | usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) ); | 2254 | usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) ); |
2255 | } | 2255 | } |
2256 | else | 2256 | else |
2257 | { | 2257 | { |