openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: replace and resize dwIsr 

dwIsr is not used outside vnt_interrupt_process and should
be u32.

Move to function and resize to u32.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2015-05-31 10:35:27 +01:00 committed by Greg Kroah-Hartman
parent 2995dfe68a
commit 41b9e5e516
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/vt6655/device.h
View File

@ -238,7 +238,6 @@ struct vnt_private {
CHIP_TYPE chip_id; CHIP_TYPE chip_id;
void __iomem *PortOffset; void __iomem *PortOffset;
unsigned long dwIsr;
u32 memaddr; u32 memaddr;
u32 ioaddr; u32 ioaddr;
u32 io_size; u32 io_size;

33
drivers/staging/vt6655/device_main.c
View File

@ -1056,15 +1056,16 @@ static void vnt_interrupt_process(struct vnt_private *priv)
struct ieee80211_low_level_stats *low_stats = &priv->low_stats; struct ieee80211_low_level_stats *low_stats = &priv->low_stats;
int max_count = 0; int max_count = 0;
u32 mib_counter; u32 mib_counter;
u32 isr;
unsigned long flags; unsigned long flags;
MACvReadISR(priv->PortOffset, &priv->dwIsr); MACvReadISR(priv->PortOffset, &isr);
if (priv->dwIsr == 0) if (isr == 0)
return; return;
if (priv->dwIsr == 0xffffffff) { if (isr == 0xffffffff) {
pr_debug("dwIsr = 0xffff\n"); pr_debug("isr = 0xffff\n");
return; return;
} }
@ -1086,18 +1087,18 @@ static void vnt_interrupt_process(struct vnt_private *priv)
* than RD/TD write back * than RD/TD write back
* update ISR counter * update ISR counter
*/ */
while (priv->dwIsr && priv->vif) { while (isr && priv->vif) {
MACvWriteISR(priv->PortOffset, priv->dwIsr); MACvWriteISR(priv->PortOffset, isr);
if (priv->dwIsr & ISR_FETALERR) { if (isr & ISR_FETALERR) {
pr_debug(" ISR_FETALERR\n"); pr_debug(" ISR_FETALERR\n");
VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0);
VNSvOutPortW(priv->PortOffset + VNSvOutPortW(priv->PortOffset +
MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI);
device_error(priv, priv->dwIsr); device_error(priv, isr);
} }
if (priv->dwIsr & ISR_TBTT) { if (isr & ISR_TBTT) {
if (priv->op_mode != NL80211_IFTYPE_ADHOC) if (priv->op_mode != NL80211_IFTYPE_ADHOC)
vnt_check_bb_vga(priv); vnt_check_bb_vga(priv);
@ -1116,7 +1117,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
} }
if (priv->dwIsr & ISR_BNTX) { if (isr & ISR_BNTX) {
if (priv->op_mode == NL80211_IFTYPE_ADHOC) { if (priv->op_mode == NL80211_IFTYPE_ADHOC) {
priv->bIsBeaconBufReadySet = false; priv->bIsBeaconBufReadySet = false;
priv->cbBeaconBufReadySetCnt = 0; priv->cbBeaconBufReadySetCnt = 0;
@ -1125,19 +1126,19 @@ static void vnt_interrupt_process(struct vnt_private *priv)
priv->bBeaconSent = true; priv->bBeaconSent = true;
} }
if (priv->dwIsr & ISR_RXDMA0) if (isr & ISR_RXDMA0)
max_count += device_rx_srv(priv, TYPE_RXDMA0); max_count += device_rx_srv(priv, TYPE_RXDMA0);
if (priv->dwIsr & ISR_RXDMA1) if (isr & ISR_RXDMA1)
max_count += device_rx_srv(priv, TYPE_RXDMA1); max_count += device_rx_srv(priv, TYPE_RXDMA1);
if (priv->dwIsr & ISR_TXDMA0) if (isr & ISR_TXDMA0)
max_count += device_tx_srv(priv, TYPE_TXDMA0); max_count += device_tx_srv(priv, TYPE_TXDMA0);
if (priv->dwIsr & ISR_AC0DMA) if (isr & ISR_AC0DMA)
max_count += device_tx_srv(priv, TYPE_AC0DMA); max_count += device_tx_srv(priv, TYPE_AC0DMA);
if (priv->dwIsr & ISR_SOFTTIMER1) { if (isr & ISR_SOFTTIMER1) {
if (priv->vif->bss_conf.enable_beacon) if (priv->vif->bss_conf.enable_beacon)
vnt_beacon_make(priv, priv->vif); vnt_beacon_make(priv, priv->vif);
} }
@ -1148,7 +1149,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
ieee80211_queue_stopped(priv->hw, 0)) ieee80211_queue_stopped(priv->hw, 0))
ieee80211_wake_queues(priv->hw); ieee80211_wake_queues(priv->hw);
MACvReadISR(priv->PortOffset, &priv->dwIsr); MACvReadISR(priv->PortOffset, &isr);
MACvReceive0(priv->PortOffset); MACvReceive0(priv->PortOffset);
MACvReceive1(priv->PortOffset); MACvReceive1(priv->PortOffset);