aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8187se/r8180.h
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/r8180.h
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/r8180.h')
-rw-r--r--drivers/staging/rtl8187se/r8180.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 1fd95303639..8b33fe00625 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -77,21 +77,6 @@ typedef enum _WIRELESS_MODE {
WIRELESS_MODE_AUTO = 0x08,
} WIRELESS_MODE;
-typedef enum _VERSION_8185{
- // RTL8185
- VERSION_8185_UNKNOWN,
- VERSION_8185_C, // C-cut
- VERSION_8185_D, // D-cut
- // RTL8185B
- VERSION_8185B_B, // B-cut
- VERSION_8185B_D, // D-cut
- VERSION_8185B_E, // E-cut
- //RTL8187S-PCIE
- VERSION_8187S_B, // B-cut
- VERSION_8187S_C, // C-cut
- VERSION_8187S_D, // D-cut
-
-}VERSION_8185,*PVERSION_8185;
typedef struct ChnlAccessSetting {
u16 SIFS_Timer;
u16 DIFS_Timer;
@@ -341,8 +326,6 @@ typedef struct r8180_priv
int irq;
struct ieee80211_device *ieee80211;
- short card_8185; /* O: rtl8180, 1:rtl8185 V B/C, 2:rtl8185 V D, 3:rtl8185B */
- short card_8185_Bversion; /* if TCR reports card V B/C this discriminates */
short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
short enable_gpio0;
enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type;