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

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

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: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad74e91d

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vt6656/wcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -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--;

drivers/staging/vt6656/wcmd.h

+0 −4
Original line number Diff line number Diff line
@@ -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,