staging: vt6656: remove typedef struct tagCMD_ITEM

Since enum vnt_cmd is only member replace with array
enum vnt_cmd cmd_queue with size of CMD_Q_SIZE

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 0c9166e2969ab60b3af8b88ec185884cb6819f74..a6eeebc6fe9574d7c0dd701e9211b69dfe5f70ca 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -406,7 +406,7 @@ struct vnt_private {
 
        /* 802.11 counter */
 
-       CMD_ITEM eCmdQueue[CMD_Q_SIZE];
+       enum vnt_cmd cmd_queue[CMD_Q_SIZE];
        u32 uCmdDequeueIdx;
        u32 uCmdEnqueueIdx;
        u32 cbFreeCmdQueue;

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index e0ad20aa49f5bad4a3ef5d9c9cb89101384b5b49..c2da8cceff10ab28e6e2afbdff3583ceed654bd7 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -146,7 +146,7 @@ static int s_bCommandComplete(struct vnt_private *priv)
                return true;
        }
 
-       priv->command = priv->eCmdQueue[priv->uCmdDequeueIdx].cmd;
+       priv->command = priv->cmd_queue[priv->uCmdDequeueIdx];
 
        ADD_ONE_WITH_WRAP_AROUND(priv->uCmdDequeueIdx, CMD_Q_SIZE);
        priv->cbFreeCmdQueue++;
@@ -192,7 +192,7 @@ int bScheduleCommand(struct vnt_private *priv, enum vnt_cmd command, u8 *item0)
        if (priv->cbFreeCmdQueue == 0)
                return false;
 
-       priv->eCmdQueue[priv->uCmdEnqueueIdx].cmd = command;
+       priv->cmd_queue[priv->uCmdEnqueueIdx] = command;
 
        ADD_ONE_WITH_WRAP_AROUND(priv->uCmdEnqueueIdx, CMD_Q_SIZE);
        priv->cbFreeCmdQueue--;

diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 283df613baad901a44fd140a934e173f1d12fb1a..f42270b8554a1336cc1414bee2143bda6deb7fc3 100644 (file)
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -56,10 +56,6 @@ typedef enum tagCMD_STATUS {
 
 } CMD_STATUS, *PCMD_STATUS;
 
-typedef struct tagCMD_ITEM {
-       enum vnt_cmd cmd;
-} CMD_ITEM, *PCMD_ITEM;
-
 /* Command state */
 enum vnt_cmd_state {
        WLAN_CMD_INIT_MAC80211_START,