tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Malcolm Priestley and committed by
Greg Kroah-Hartman 41b9e5e5 2995dfe6

+17 -17
-1
drivers/staging/vt6655/device.h
··· 238 238 CHIP_TYPE chip_id; 239 239 240 240 void __iomem *PortOffset; 241 - unsigned long dwIsr; 242 241 u32 memaddr; 243 242 u32 ioaddr; 244 243 u32 io_size;
+17 -16
drivers/staging/vt6655/device_main.c
··· 1056 1056 struct ieee80211_low_level_stats *low_stats = &priv->low_stats; 1057 1057 int max_count = 0; 1058 1058 u32 mib_counter; 1059 + u32 isr; 1059 1060 unsigned long flags; 1060 1061 1061 - MACvReadISR(priv->PortOffset, &priv->dwIsr); 1062 + MACvReadISR(priv->PortOffset, &isr); 1062 1063 1063 - if (priv->dwIsr == 0) 1064 + if (isr == 0) 1064 1065 return; 1065 1066 1066 - if (priv->dwIsr == 0xffffffff) { 1067 - pr_debug("dwIsr = 0xffff\n"); 1067 + if (isr == 0xffffffff) { 1068 + pr_debug("isr = 0xffff\n"); 1068 1069 return; 1069 1070 } 1070 1071 ··· 1087 1086 * than RD/TD write back 1088 1087 * update ISR counter 1089 1088 */ 1090 - while (priv->dwIsr && priv->vif) { 1091 - MACvWriteISR(priv->PortOffset, priv->dwIsr); 1089 + while (isr && priv->vif) { 1090 + MACvWriteISR(priv->PortOffset, isr); 1092 1091 1093 - if (priv->dwIsr & ISR_FETALERR) { 1092 + if (isr & ISR_FETALERR) { 1094 1093 pr_debug(" ISR_FETALERR\n"); 1095 1094 VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); 1096 1095 VNSvOutPortW(priv->PortOffset + 1097 1096 MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); 1098 - device_error(priv, priv->dwIsr); 1097 + device_error(priv, isr); 1099 1098 } 1100 1099 1101 - if (priv->dwIsr & ISR_TBTT) { 1100 + if (isr & ISR_TBTT) { 1102 1101 if (priv->op_mode != NL80211_IFTYPE_ADHOC) 1103 1102 vnt_check_bb_vga(priv); 1104 1103 ··· 1117 1116 1118 1117 } 1119 1118 1120 - if (priv->dwIsr & ISR_BNTX) { 1119 + if (isr & ISR_BNTX) { 1121 1120 if (priv->op_mode == NL80211_IFTYPE_ADHOC) { 1122 1121 priv->bIsBeaconBufReadySet = false; 1123 1122 priv->cbBeaconBufReadySetCnt = 0; ··· 1126 1125 priv->bBeaconSent = true; 1127 1126 } 1128 1127 1129 - if (priv->dwIsr & ISR_RXDMA0) 1128 + if (isr & ISR_RXDMA0) 1130 1129 max_count += device_rx_srv(priv, TYPE_RXDMA0); 1131 1130 1132 - if (priv->dwIsr & ISR_RXDMA1) 1131 + if (isr & ISR_RXDMA1) 1133 1132 max_count += device_rx_srv(priv, TYPE_RXDMA1); 1134 1133 1135 - if (priv->dwIsr & ISR_TXDMA0) 1134 + if (isr & ISR_TXDMA0) 1136 1135 max_count += device_tx_srv(priv, TYPE_TXDMA0); 1137 1136 1138 - if (priv->dwIsr & ISR_AC0DMA) 1137 + if (isr & ISR_AC0DMA) 1139 1138 max_count += device_tx_srv(priv, TYPE_AC0DMA); 1140 1139 1141 - if (priv->dwIsr & ISR_SOFTTIMER1) { 1140 + if (isr & ISR_SOFTTIMER1) { 1142 1141 if (priv->vif->bss_conf.enable_beacon) 1143 1142 vnt_beacon_make(priv, priv->vif); 1144 1143 } ··· 1149 1148 ieee80211_queue_stopped(priv->hw, 0)) 1150 1149 ieee80211_wake_queues(priv->hw); 1151 1150 1152 - MACvReadISR(priv->PortOffset, &priv->dwIsr); 1151 + MACvReadISR(priv->PortOffset, &isr); 1153 1152 1154 1153 MACvReceive0(priv->PortOffset); 1155 1154 MACvReceive1(priv->PortOffset);