diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-11 22:37:27 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-23 20:12:53 -0500 |
| commit | b355c1d0bceee3276b406327c6f1765c73901ab0 (patch) | |
| tree | 5170b48a1b829e30b6832d76ac09ffa5bd4eaa38 /drivers/staging/rtl8192e/r8192E_dev.c | |
| parent | 1e71e6d0cf764841cdf60dec4a40849ff41be75c (diff) | |
| download | op-kernel-dev-b355c1d0bceee3276b406327c6f1765c73901ab0.zip op-kernel-dev-b355c1d0bceee3276b406327c6f1765c73901ab0.tar.gz | |
staging: rtl8192e: Remove dead code associated with RTL8192CE
The vendor code will generate several different drivers. As the RTL8192CE
is covered by a mac80211 driver in mainline, eliminate that code here.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/r8192E_dev.c')
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_dev.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c index 7ec2fd9..3ced5d2 100644 --- a/drivers/staging/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/r8192E_dev.c @@ -2196,11 +2196,7 @@ void rtl8192_EnableInterrupt(struct net_device *dev) struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); priv->irq_enabled = 1; -#ifdef RTL8192CE - write_nic_dword(dev, REG_HIMR, priv->irq_mask[0]&0xFFFFFFFF); -#else write_nic_dword(dev,INTA_MASK, priv->irq_mask[0]); -#endif } @@ -2208,11 +2204,7 @@ void rtl8192_DisableInterrupt(struct net_device *dev) { struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); -#ifdef RTL8192CE - write_nic_dword(dev, REG_HIMR, IMR8190_DISABLED); -#else write_nic_dword(dev,INTA_MASK,0); -#endif priv->irq_enabled = 0; } @@ -2220,14 +2212,8 @@ void rtl8192_DisableInterrupt(struct net_device *dev) void rtl8192_ClearInterrupt(struct net_device *dev) { u32 tmp = 0; -#ifdef RTL8192CE - tmp = read_nic_dword(dev, REG_HISR); - write_nic_dword(dev, REG_HISR, tmp); -#else tmp = read_nic_dword(dev, ISR); write_nic_dword(dev, ISR, tmp); -#endif - } @@ -2253,17 +2239,10 @@ void rtl8192_beacon_disable(struct net_device *dev) struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); u32 reg; -#ifdef RTL8192CE - reg = read_nic_dword(priv->rtllib->dev,REG_HIMR); - - reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); - write_nic_dword(priv->rtllib->dev, REG_HIMR, reg); -#else reg = read_nic_dword(priv->rtllib->dev,INTA_MASK); reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); write_nic_dword(priv->rtllib->dev, INTA_MASK, reg); -#endif } void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb) |
