Skip to content

Commit

Permalink
Staging: rtl8187se: Remove card8185 variable to simplify flow
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Larry Finger authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent bbc9a99 commit d44eb88
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 259 deletions.
17 changes: 0 additions & 17 deletions drivers/staging/rtl8187se/r8180.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit d44eb88

Please sign in to comment.