hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: vt6656: vRunCommand remove multi calls to s_bCommandComplete. 

Remove calls with break
s_bCommandComplete(pDevice);
spin_unlock_irq(&pDevice->lock);
return;

Add single call to s_bCommandComplete;

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-02-19 19:35:16 +00:00 committed by Greg Kroah-Hartman
parent edd20e9640
commit 2ae2777c44
1 changed files with 17 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/staging/vt6656/wcmd.c
View File

@ -293,17 +293,11 @@ void vRunCommand(struct work_struct *work)
case WLAN_CMD_SCAN_START: case WLAN_CMD_SCAN_START:
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
if (pDevice->bRadioOff == true) { if (pDevice->bRadioOff == true)
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
}
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
}
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID;
@ -311,16 +305,12 @@ void vRunCommand(struct work_struct *work)
pMgmt->uScanChannel = pDevice->byMinChannel; pMgmt->uScanChannel = pDevice->byMinChannel;
if (pMgmt->uScanChannel > pDevice->byMaxChannel) { if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
pDevice->eCommandState = WLAN_CMD_SCAN_END; pDevice->eCommandState = WLAN_CMD_SCAN_END;
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
} else { } else {
if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) { if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel);
pMgmt->uScanChannel++; pMgmt->uScanChannel++;
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
} }
if (pMgmt->uScanChannel == pDevice->byMinChannel) { if (pMgmt->uScanChannel == pDevice->byMinChannel) {
// pMgmt->eScanType = WMAC_SCAN_ACTIVE; //mike mark // pMgmt->eScanType = WMAC_SCAN_ACTIVE; //mike mark
@ -420,16 +410,13 @@ void vRunCommand(struct work_struct *work)
memset(&wrqu, 0, sizeof(wrqu)); memset(&wrqu, 0, sizeof(wrqu));
wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL); wireless_send_event(pDevice->dev, SIOCGIWSCAN, &wrqu, NULL);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_DISASSOCIATE_START: case WLAN_CMD_DISASSOCIATE_START:
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
(pMgmt->eCurrState != WMAC_STATE_ASSOC)) { (pMgmt->eCurrState != WMAC_STATE_ASSOC)) {
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
} else { } else {
pDevice->bwextstep0 = false; pDevice->bwextstep0 = false;
pDevice->bwextstep1 = false; pDevice->bwextstep1 = false;
@ -458,17 +445,14 @@ void vRunCommand(struct work_struct *work)
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
if (pDevice->bNeedRadioOFF == true) if (pDevice->bNeedRadioOFF == true)
CARDbRadioPowerOff(pDevice); CARDbRadioPowerOff(pDevice);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_SSID_START: case WLAN_CMD_SSID_START:
pDevice->byReAssocCount = 0; pDevice->byReAssocCount = 0;
if (pDevice->bRadioOff == true) { if (pDevice->bRadioOff == true)
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
}
memcpy(pMgmt->abyAdHocSSID, pMgmt->abyDesireSSID, memcpy(pMgmt->abyAdHocSSID, pMgmt->abyDesireSSID,
((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);
@ -489,11 +473,9 @@ void vRunCommand(struct work_struct *work)
if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) || if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) { ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
if (pItemSSID->len == pItemSSIDCurr->len) { if (pItemSSID->len == pItemSSIDCurr->len) {
if (memcmp(pItemSSID->abySSID, pItemSSIDCurr->abySSID, pItemSSID->len) == 0) { if (!memcmp(pItemSSID->abySSID,
s_bCommandComplete(pDevice); pItemSSIDCurr->abySSID, pItemSSID->len))
spin_unlock_irq(&pDevice->lock); break;
return;
}
} }
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
pDevice->bLinkPass = false; pDevice->bLinkPass = false;
@ -582,7 +564,6 @@ void vRunCommand(struct work_struct *work)
} }
} }
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_AUTHENTICATE_WAIT: case WLAN_AUTHENTICATE_WAIT:
@ -612,7 +593,6 @@ void vRunCommand(struct work_struct *work)
} }
pDevice->byLinkWaitCount = 0; pDevice->byLinkWaitCount = 0;
s_bCommandComplete(pDevice);
break; break;
case WLAN_ASSOCIATE_WAIT: case WLAN_ASSOCIATE_WAIT:
@ -647,7 +627,6 @@ void vRunCommand(struct work_struct *work)
return; return;
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_AP_MODE_START: case WLAN_CMD_AP_MODE_START:
@ -683,7 +662,6 @@ void vRunCommand(struct work_struct *work)
ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER); ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
schedule_delayed_work(&pDevice->second_callback_work, HZ); schedule_delayed_work(&pDevice->second_callback_work, HZ);
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_TX_PSPACKET_START: case WLAN_CMD_TX_PSPACKET_START:
@ -738,8 +716,6 @@ void vRunCommand(struct work_struct *work)
pMgmt->sNodeDBTable[ii].bRxPSPoll = false; pMgmt->sNodeDBTable[ii].bRxPSPoll = false;
} }
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_RADIO_START: case WLAN_CMD_RADIO_START:
@ -760,11 +736,8 @@ void vRunCommand(struct work_struct *work)
1, 1,
&byTmp); &byTmp);
if (ntStatus != STATUS_SUCCESS) { if (ntStatus != STATUS_SUCCESS)
s_bCommandComplete(pDevice); break;
spin_unlock_irq(&pDevice->lock);
return;
}
if ((byTmp & GPIO3_DATA) == 0) { if ((byTmp & GPIO3_DATA) == 0) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_OFF........................\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_OFF........................\n");
// Old commands are useless. // Old commands are useless.
@ -833,7 +806,6 @@ void vRunCommand(struct work_struct *work)
} }
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_CHANGE_BBSENSITIVITY_START: case WLAN_CMD_CHANGE_BBSENSITIVITY_START:
@ -843,24 +815,20 @@ void vRunCommand(struct work_struct *work)
BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent); BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change sensitivity pDevice->byBBVGACurrent = %x\n", pDevice->byBBVGACurrent); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change sensitivity pDevice->byBBVGACurrent = %x\n", pDevice->byBBVGACurrent);
pDevice->bStopDataPkt = false; pDevice->bStopDataPkt = false;
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_TBTT_WAKEUP_START: case WLAN_CMD_TBTT_WAKEUP_START:
PSbIsNextTBTTWakeUp(pDevice); PSbIsNextTBTTWakeUp(pDevice);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_BECON_SEND_START: case WLAN_CMD_BECON_SEND_START:
bMgrPrepareBeaconToSend(pDevice, pMgmt); bMgrPrepareBeaconToSend(pDevice, pMgmt);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_SETPOWER_START: case WLAN_CMD_SETPOWER_START:
RFbSetPower(pDevice, pDevice->wCurrentRate, pMgmt->uCurrChannel); RFbSetPower(pDevice, pDevice->wCurrentRate, pMgmt->uCurrChannel);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_CHANGE_ANTENNA_START: case WLAN_CMD_CHANGE_ANTENNA_START:
@ -878,12 +846,10 @@ void vRunCommand(struct work_struct *work)
else else
BBvSetAntennaMode(pDevice, ANT_RXA); BBvSetAntennaMode(pDevice, ANT_RXA);
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_REMOVE_ALLKEY_START: case WLAN_CMD_REMOVE_ALLKEY_START:
KeybRemoveAllKey(pDevice, &(pDevice->sKey), pDevice->abyBSSID); KeybRemoveAllKey(pDevice, &(pDevice->sKey), pDevice->abyBSSID);
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_MAC_DISPOWERSAVING_START: case WLAN_CMD_MAC_DISPOWERSAVING_START:
@ -898,7 +864,6 @@ void vRunCommand(struct work_struct *work)
NULL NULL
); );
} }
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_11H_CHSW_START: case WLAN_CMD_11H_CHSW_START:
@ -906,18 +871,17 @@ void vRunCommand(struct work_struct *work)
pDevice->bChannelSwitch = false; pDevice->bChannelSwitch = false;
pMgmt->uCurrChannel = pDevice->byNewChannel; pMgmt->uCurrChannel = pDevice->byNewChannel;
pDevice->bStopDataPkt = false; pDevice->bStopDataPkt = false;
s_bCommandComplete(pDevice);
break; break;
case WLAN_CMD_CONFIGURE_FILTER_START: case WLAN_CMD_CONFIGURE_FILTER_START:
vnt_configure_filter(pDevice); vnt_configure_filter(pDevice);
s_bCommandComplete(pDevice);
break; break;
default: default:
s_bCommandComplete(pDevice);
break; break;
} //switch } //switch
s_bCommandComplete(pDevice);
spin_unlock_irq(&pDevice->lock); spin_unlock_irq(&pDevice->lock);
return; return;
} }