summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-02-21 00:05:19 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 14:10:10 -0800
commitae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6 (patch)
treea17a9270f8f54e65539eedacdfae1345553e2e37
parent703fdcc39856a73800df8d749930c8d7bbf21571 (diff)
downloadlinux-3.10-ae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6.tar.gz
linux-3.10-ae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6.tar.bz2
linux-3.10-ae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6.zip
staging: rtl8192e: Remove struct member irq_mask
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rtl8192e/r8192E.h1
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c14
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 03306869620..220f2b11424 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -810,7 +810,6 @@ typedef struct r8192_priv
struct mutex mutex;
spinlock_t ps_lock;
- u32 irq_mask;
short chan;
short sens;
/* RX stuff */
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 9a88f49d4ff..8f68ac07b56 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -617,7 +617,14 @@ static void tx_timeout(struct net_device *dev)
static void rtl8192_irq_enable(struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
- write_nic_dword(priv, INTA_MASK, priv->irq_mask);
+ u32 mask;
+
+ mask = IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
+ IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
+ IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
+ IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER;
+
+ write_nic_dword(priv, INTA_MASK, mask);
}
static void rtl8192_irq_disable(struct net_device *dev)
@@ -2042,11 +2049,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) |
((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT;
- priv->irq_mask = (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
- IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
- IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
- IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
-
priv->pFirmware = vzalloc(sizeof(rt_firmware));
/* rx related queue */