Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d287093e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: s_bCommandComplete clean up and remove camel case 



pDevice -> priv

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a675dc21

drivers/staging/vt6656/wcmd.c

+17 −17
Original line number Diff line number Diff line
@@ -139,52 +139,52 @@ void vRunCommand(struct work_struct *work) 
	return;

}



static int s_bCommandComplete(struct vnt_private *pDevice)

static int s_bCommandComplete(struct vnt_private *priv)

{



	pDevice->eCommandState = WLAN_CMD_IDLE;

	if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {

		//Command Queue Empty

		pDevice->bCmdRunning = false;

	priv->eCommandState = WLAN_CMD_IDLE;

	if (priv->cbFreeCmdQueue == CMD_Q_SIZE) {

		/* Command Queue Empty */

		priv->bCmdRunning = false;

		return true;

	}



	pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;

	priv->eCommand = priv->eCmdQueue[priv->uCmdDequeueIdx].eCmd;



	ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);

	pDevice->cbFreeCmdQueue++;

	pDevice->bCmdRunning = true;

	ADD_ONE_WITH_WRAP_AROUND(priv->uCmdDequeueIdx, CMD_Q_SIZE);

	priv->cbFreeCmdQueue++;

	priv->bCmdRunning = true;



	switch (pDevice->eCommand) {

	switch (priv->eCommand) {

	case WLAN_CMD_INIT_MAC80211:

		pDevice->eCommandState = WLAN_CMD_INIT_MAC80211_START;

		priv->eCommandState = WLAN_CMD_INIT_MAC80211_START;

		break;



	case WLAN_CMD_TBTT_WAKEUP:

		pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;

		priv->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;

		break;



	case WLAN_CMD_BECON_SEND:

		pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;

		priv->eCommandState = WLAN_CMD_BECON_SEND_START;

		break;



	case WLAN_CMD_SETPOWER:

		pDevice->eCommandState = WLAN_CMD_SETPOWER_START;

		priv->eCommandState = WLAN_CMD_SETPOWER_START;

		break;



	case WLAN_CMD_CHANGE_ANTENNA:

		pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;

		priv->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;

		break;



	case WLAN_CMD_11H_CHSW:

		pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;

		priv->eCommandState = WLAN_CMD_11H_CHSW_START;

		break;



	default:

		break;

	}



	vCommandTimerWait(pDevice, 0);

	vCommandTimerWait(priv, 0);



	return true;

}