aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/r8180_core.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2009-11-10 16:44:47 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:20 -0800
commit8eee44dafdaaafaa0623c3ceaf4e507403365311 (patch)
treecc5d9fe7626b50207bc8b8c23ff9041eace81e0d /drivers/staging/rtl8187se/r8180_core.c
parentd44eb889ccf80e417794963e57cc40bd1519e554 (diff)
Staging: rtl8187se: Remove card_type
The vendor-written driver for the RTL8187SE has a private variable for the card type, even though it only occurs in PCI format. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_core.c')
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 585cf683a04..57c62b0a402 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -2911,8 +2911,6 @@ short rtl8180_init(struct net_device *dev)
priv->ieee80211->short_slot = 1;
// just for sync 85
- priv->card_type = PCI;
- DMESG("This is a PCI NIC");
priv->enable_gpio0 = 0;
usValue = eprom_read(dev, EEPROM_SW_REVD_OFFSET);
@@ -3233,7 +3231,6 @@ void rtl8185_set_rate(struct net_device *dev)
void rtl8180_adapter_start(struct net_device *dev)
{
struct r8180_priv *priv = ieee80211_priv(dev);
- u8 config3;
rtl8180_rtx_disable(dev);
rtl8180_reset(dev);
@@ -3247,12 +3244,6 @@ void rtl8180_adapter_start(struct net_device *dev)
rtl8180_beacon_tx_disable(dev);
- if(priv->card_type == CARDBUS ){
- config3=read_nic_byte(dev, CONFIG3);
- write_nic_byte(dev,CONFIG3,config3 | CONFIG3_FuncRegEn);
- write_nic_word(dev,FEMR, FEMR_INTR | FEMR_WKUP | FEMR_GWAKE |
- read_nic_word(dev, FEMR));
- }
rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)[0]);
write_nic_word(dev, MAC4, ((u32*)dev->dev_addr)[1] & 0xffff );