diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-13 10:42:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 12:22:34 -0700 |
| commit | b595f9b89c609476de8165ee081f8fb5d25d02f7 (patch) | |
| tree | 57a0448ccb48d03abc74e7f975c78a5a0a178465 /drivers/staging | |
| parent | ad74e91d06225e9f649baad786faf0992e996050 (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wcmd.c | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wcmd.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 0c9166e2969a..a6eeebc6fe95 100644 --- 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 e0ad20aa49f5..c2da8cceff10 100644 --- 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 283df613baad..f42270b8554a 100644 --- 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, |