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: vnt_interrupt_process remove camel case.

pDevice -> priv

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 2995dfe6 f33d8d63

+52 -51
+52 -51
drivers/staging/vt6655/device_main.c
··· 1051 1051 } 1052 1052 } 1053 1053 1054 - static void vnt_interrupt_process(struct vnt_private *pDevice) 1054 + static void vnt_interrupt_process(struct vnt_private *priv) 1055 1055 { 1056 - struct ieee80211_low_level_stats *low_stats = &pDevice->low_stats; 1056 + struct ieee80211_low_level_stats *low_stats = &priv->low_stats; 1057 1057 int max_count = 0; 1058 1058 u32 mib_counter; 1059 1059 unsigned long flags; 1060 1060 1061 - MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr); 1061 + MACvReadISR(priv->PortOffset, &priv->dwIsr); 1062 1062 1063 - if (pDevice->dwIsr == 0) 1063 + if (priv->dwIsr == 0) 1064 1064 return; 1065 1065 1066 - if (pDevice->dwIsr == 0xffffffff) { 1066 + if (priv->dwIsr == 0xffffffff) { 1067 1067 pr_debug("dwIsr = 0xffff\n"); 1068 1068 return; 1069 1069 } 1070 1070 1071 - MACvIntDisable(pDevice->PortOffset); 1071 + MACvIntDisable(priv->PortOffset); 1072 1072 1073 - spin_lock_irqsave(&pDevice->lock, flags); 1073 + spin_lock_irqsave(&priv->lock, flags); 1074 1074 1075 1075 /* Read low level stats */ 1076 - MACvReadMIBCounter(pDevice->PortOffset, &mib_counter); 1076 + MACvReadMIBCounter(priv->PortOffset, &mib_counter); 1077 1077 1078 1078 low_stats->dot11RTSSuccessCount += mib_counter & 0xff; 1079 1079 low_stats->dot11RTSFailureCount += (mib_counter >> 8) & 0xff; ··· 1086 1086 * than RD/TD write back 1087 1087 * update ISR counter 1088 1088 */ 1089 - while (pDevice->dwIsr && pDevice->vif) { 1090 - MACvWriteISR(pDevice->PortOffset, pDevice->dwIsr); 1089 + while (priv->dwIsr && priv->vif) { 1090 + MACvWriteISR(priv->PortOffset, priv->dwIsr); 1091 1091 1092 - if (pDevice->dwIsr & ISR_FETALERR) { 1092 + if (priv->dwIsr & ISR_FETALERR) { 1093 1093 pr_debug(" ISR_FETALERR\n"); 1094 - VNSvOutPortB(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, 0); 1095 - VNSvOutPortW(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); 1096 - device_error(pDevice, pDevice->dwIsr); 1094 + VNSvOutPortB(priv->PortOffset + MAC_REG_SOFTPWRCTL, 0); 1095 + VNSvOutPortW(priv->PortOffset + 1096 + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); 1097 + device_error(priv, priv->dwIsr); 1097 1098 } 1098 1099 1099 - if (pDevice->dwIsr & ISR_TBTT) { 1100 - if (pDevice->op_mode != NL80211_IFTYPE_ADHOC) 1101 - vnt_check_bb_vga(pDevice); 1100 + if (priv->dwIsr & ISR_TBTT) { 1101 + if (priv->op_mode != NL80211_IFTYPE_ADHOC) 1102 + vnt_check_bb_vga(priv); 1102 1103 1103 - pDevice->bBeaconSent = false; 1104 - if (pDevice->bEnablePSMode) 1105 - PSbIsNextTBTTWakeUp((void *)pDevice); 1104 + priv->bBeaconSent = false; 1105 + if (priv->bEnablePSMode) 1106 + PSbIsNextTBTTWakeUp((void *)priv); 1106 1107 1107 - if ((pDevice->op_mode == NL80211_IFTYPE_AP || 1108 - pDevice->op_mode == NL80211_IFTYPE_ADHOC) && 1109 - pDevice->vif->bss_conf.enable_beacon) { 1110 - MACvOneShotTimer1MicroSec(pDevice->PortOffset, 1111 - (pDevice->vif->bss_conf.beacon_int - MAKE_BEACON_RESERVED) << 10); 1108 + if ((priv->op_mode == NL80211_IFTYPE_AP || 1109 + priv->op_mode == NL80211_IFTYPE_ADHOC) && 1110 + priv->vif->bss_conf.enable_beacon) { 1111 + MACvOneShotTimer1MicroSec(priv->PortOffset, 1112 + (priv->vif->bss_conf.beacon_int - MAKE_BEACON_RESERVED) << 10); 1112 1113 } 1113 1114 1114 1115 /* TODO: adhoc PS mode */ 1115 1116 1116 1117 } 1117 1118 1118 - if (pDevice->dwIsr & ISR_BNTX) { 1119 - if (pDevice->op_mode == NL80211_IFTYPE_ADHOC) { 1120 - pDevice->bIsBeaconBufReadySet = false; 1121 - pDevice->cbBeaconBufReadySetCnt = 0; 1119 + if (priv->dwIsr & ISR_BNTX) { 1120 + if (priv->op_mode == NL80211_IFTYPE_ADHOC) { 1121 + priv->bIsBeaconBufReadySet = false; 1122 + priv->cbBeaconBufReadySetCnt = 0; 1122 1123 } 1123 1124 1124 - pDevice->bBeaconSent = true; 1125 + priv->bBeaconSent = true; 1125 1126 } 1126 1127 1127 - if (pDevice->dwIsr & ISR_RXDMA0) 1128 - max_count += device_rx_srv(pDevice, TYPE_RXDMA0); 1128 + if (priv->dwIsr & ISR_RXDMA0) 1129 + max_count += device_rx_srv(priv, TYPE_RXDMA0); 1129 1130 1130 - if (pDevice->dwIsr & ISR_RXDMA1) 1131 - max_count += device_rx_srv(pDevice, TYPE_RXDMA1); 1131 + if (priv->dwIsr & ISR_RXDMA1) 1132 + max_count += device_rx_srv(priv, TYPE_RXDMA1); 1132 1133 1133 - if (pDevice->dwIsr & ISR_TXDMA0) 1134 - max_count += device_tx_srv(pDevice, TYPE_TXDMA0); 1134 + if (priv->dwIsr & ISR_TXDMA0) 1135 + max_count += device_tx_srv(priv, TYPE_TXDMA0); 1135 1136 1136 - if (pDevice->dwIsr & ISR_AC0DMA) 1137 - max_count += device_tx_srv(pDevice, TYPE_AC0DMA); 1137 + if (priv->dwIsr & ISR_AC0DMA) 1138 + max_count += device_tx_srv(priv, TYPE_AC0DMA); 1138 1139 1139 - if (pDevice->dwIsr & ISR_SOFTTIMER1) { 1140 - if (pDevice->vif->bss_conf.enable_beacon) 1141 - vnt_beacon_make(pDevice, pDevice->vif); 1140 + if (priv->dwIsr & ISR_SOFTTIMER1) { 1141 + if (priv->vif->bss_conf.enable_beacon) 1142 + vnt_beacon_make(priv, priv->vif); 1142 1143 } 1143 1144 1144 1145 /* If both buffers available wake the queue */ 1145 - if (AVAIL_TD(pDevice, TYPE_TXDMA0) && 1146 - AVAIL_TD(pDevice, TYPE_AC0DMA) && 1147 - ieee80211_queue_stopped(pDevice->hw, 0)) 1148 - ieee80211_wake_queues(pDevice->hw); 1146 + if (AVAIL_TD(priv, TYPE_TXDMA0) && 1147 + AVAIL_TD(priv, TYPE_AC0DMA) && 1148 + ieee80211_queue_stopped(priv->hw, 0)) 1149 + ieee80211_wake_queues(priv->hw); 1149 1150 1150 - MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr); 1151 + MACvReadISR(priv->PortOffset, &priv->dwIsr); 1151 1152 1152 - MACvReceive0(pDevice->PortOffset); 1153 - MACvReceive1(pDevice->PortOffset); 1153 + MACvReceive0(priv->PortOffset); 1154 + MACvReceive1(priv->PortOffset); 1154 1155 1155 - if (max_count > pDevice->sOpts.int_works) 1156 + if (max_count > priv->sOpts.int_works) 1156 1157 break; 1157 1158 } 1158 1159 1159 - spin_unlock_irqrestore(&pDevice->lock, flags); 1160 + spin_unlock_irqrestore(&priv->lock, flags); 1160 1161 1161 - MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); 1162 + MACvIntEnable(priv->PortOffset, IMR_MASK_VALUE); 1162 1163 } 1163 1164 1164 1165 static void vnt_interrupt_work(struct work_struct *work)