aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/r8185b_init.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2009-11-09 10:53:20 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:20 -0800
commitd44eb889ccf80e417794963e57cc40bd1519e554 (patch)
tree3f5dc7beb1dd9fd06e61a7c35ae289174a128f95 /drivers/staging/rtl8187se/r8185b_init.c
parentbbc9a9916bc1cd997f3bf303e7930d5f3c804d37 (diff)
Staging: rtl8187se: Remove card8185 variable to simplify flow
When this code is used for the rtl8187se, the value of card_8185 in struct r8180_priv is always 7 or 8. As a result, the program flow can be simplified. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Tested-by: Bernhard Schiffner <bernhard@schiffner-limbach.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8185b_init.c')
-rw-r--r--drivers/staging/rtl8187se/r8185b_init.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index bdb66d83778..50309f2da9c 100644
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -1023,6 +1023,7 @@ ZEBRA_Config_85BASIC_HardCode(
u32 addr,data;
u32 u4bRegOffset, u4bRegValue, u4bRF23, u4bRF24;
u8 u1b24E;
+ int d_cut = 0;
//=============================================================================
@@ -1035,8 +1036,10 @@ ZEBRA_Config_85BASIC_HardCode(
u4bRF23= RF_ReadReg(dev, 0x08); mdelay(1);
u4bRF24= RF_ReadReg(dev, 0x09); mdelay(1);
- if (u4bRF23==0x818 && u4bRF24==0x70C && priv->card_8185 == VERSION_8187S_C)
- priv->card_8185 = VERSION_8187S_D;
+ if (u4bRF23 == 0x818 && u4bRF24 == 0x70C) {
+ d_cut = 1;
+ printk(KERN_INFO "rtl8187se: card type changed from C- to D-cut\n");
+ }
// Page0 : reg0-reg15
@@ -1070,18 +1073,9 @@ ZEBRA_Config_85BASIC_HardCode(
RF_WriteReg(dev, 0x03, 0x0806); mdelay(1);
- if(priv->card_8185 < VERSION_8187S_C)
- {
- RF_WriteReg(dev, 0x04, 0x03f7); mdelay(1);
- RF_WriteReg(dev, 0x05, 0x05ab); mdelay(1);
- RF_WriteReg(dev, 0x06, 0x00c1); mdelay(1);
- }
- else
- {
- RF_WriteReg(dev, 0x04, 0x03a7); mdelay(1);
- RF_WriteReg(dev, 0x05, 0x059b); mdelay(1);
- RF_WriteReg(dev, 0x06, 0x0081); mdelay(1);
- }
+ RF_WriteReg(dev, 0x04, 0x03a7); mdelay(1);
+ RF_WriteReg(dev, 0x05, 0x059b); mdelay(1);
+ RF_WriteReg(dev, 0x06, 0x0081); mdelay(1);
RF_WriteReg(dev, 0x07, 0x01A0); mdelay(1);
@@ -1091,14 +1085,11 @@ ZEBRA_Config_85BASIC_HardCode(
RF_WriteReg(dev, 0x0a, 0x0001); mdelay(1);
RF_WriteReg(dev, 0x0b, 0x0418); mdelay(1);
- if(priv->card_8185 == VERSION_8187S_D)
- {
+ if (d_cut) {
RF_WriteReg(dev, 0x0c, 0x0fbe); mdelay(1);
RF_WriteReg(dev, 0x0d, 0x0008); mdelay(1);
RF_WriteReg(dev, 0x0e, 0x0807); mdelay(1); // RX LO buffer
- }
- else
- {
+ } else {
RF_WriteReg(dev, 0x0c, 0x0fbe); mdelay(1);
RF_WriteReg(dev, 0x0d, 0x0008); mdelay(1);
RF_WriteReg(dev, 0x0e, 0x0806); mdelay(1); // RX LO buffer