From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 13 Jul 2014 09:42:42 +0000 (+0100)
Subject: staging: vt6656: replace typedef enum tagCMD_STATE with enum vnt_cmd_state
X-Git-Tag: v3.17-rc1~123^2~807
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad74e91d06225e9f649baad786faf0992e996050;p=karo-tx-linux.git

staging: vt6656: replace typedef enum tagCMD_STATE with enum vnt_cmd_state

Replacing variables.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 4630206710db..0c9166e2969a 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -398,7 +398,7 @@ struct vnt_private {
 	/* Beacon releated */
 	u16 wSeqCounter;
 
-	CMD_STATE eCommandState;
+	enum vnt_cmd_state command_state;
 
 	enum vnt_cmd command;
 
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 3d9ace2febd0..e0ad20aa49f5 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -67,7 +67,7 @@ void vRunCommand(struct work_struct *work)
 	if (priv->bCmdRunning != true)
 		return;
 
-	switch (priv->eCommandState) {
+	switch (priv->command_state) {
 	case WLAN_CMD_INIT_MAC80211_START:
 		if (priv->mac_hw)
 			break;
@@ -139,7 +139,7 @@ void vRunCommand(struct work_struct *work)
 static int s_bCommandComplete(struct vnt_private *priv)
 {
 
-	priv->eCommandState = WLAN_CMD_IDLE;
+	priv->command_state = WLAN_CMD_IDLE;
 	if (priv->cbFreeCmdQueue == CMD_Q_SIZE) {
 		/* Command Queue Empty */
 		priv->bCmdRunning = false;
@@ -154,27 +154,27 @@ static int s_bCommandComplete(struct vnt_private *priv)
 
 	switch (priv->command) {
 	case WLAN_CMD_INIT_MAC80211:
-		priv->eCommandState = WLAN_CMD_INIT_MAC80211_START;
+		priv->command_state = WLAN_CMD_INIT_MAC80211_START;
 		break;
 
 	case WLAN_CMD_TBTT_WAKEUP:
-		priv->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
+		priv->command_state = WLAN_CMD_TBTT_WAKEUP_START;
 		break;
 
 	case WLAN_CMD_BECON_SEND:
-		priv->eCommandState = WLAN_CMD_BECON_SEND_START;
+		priv->command_state = WLAN_CMD_BECON_SEND_START;
 		break;
 
 	case WLAN_CMD_SETPOWER:
-		priv->eCommandState = WLAN_CMD_SETPOWER_START;
+		priv->command_state = WLAN_CMD_SETPOWER_START;
 		break;
 
 	case WLAN_CMD_CHANGE_ANTENNA:
-		priv->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
+		priv->command_state = WLAN_CMD_CHANGE_ANTENNA_START;
 		break;
 
 	case WLAN_CMD_11H_CHSW:
-		priv->eCommandState = WLAN_CMD_11H_CHSW_START;
+		priv->command_state = WLAN_CMD_11H_CHSW_START;
 		break;
 
 	default:
@@ -209,7 +209,7 @@ void vResetCommandTimer(struct vnt_private *priv)
 	priv->cbFreeCmdQueue = CMD_Q_SIZE;
 	priv->uCmdDequeueIdx = 0;
 	priv->uCmdEnqueueIdx = 0;
-	priv->eCommandState = WLAN_CMD_IDLE;
+	priv->command_state = WLAN_CMD_IDLE;
 	priv->bCmdRunning = false;
 	priv->bCmdClear = false;
 }
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 1d0201a49c69..283df613baad 100644
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -60,16 +60,16 @@ typedef struct tagCMD_ITEM {
 	enum vnt_cmd cmd;
 } CMD_ITEM, *PCMD_ITEM;
 
-// Command state
-typedef enum tagCMD_STATE {
-    WLAN_CMD_INIT_MAC80211_START,
-    WLAN_CMD_SETPOWER_START,
-    WLAN_CMD_TBTT_WAKEUP_START,
-    WLAN_CMD_BECON_SEND_START,
-    WLAN_CMD_CHANGE_ANTENNA_START,
-    WLAN_CMD_11H_CHSW_START,
-    WLAN_CMD_IDLE
-} CMD_STATE, *PCMD_STATE;
+/* Command state */
+enum vnt_cmd_state {
+	WLAN_CMD_INIT_MAC80211_START,
+	WLAN_CMD_SETPOWER_START,
+	WLAN_CMD_TBTT_WAKEUP_START,
+	WLAN_CMD_BECON_SEND_START,
+	WLAN_CMD_CHANGE_ANTENNA_START,
+	WLAN_CMD_11H_CHSW_START,
+	WLAN_CMD_IDLE
+};
 
 struct vnt_private;