Commit efc72b11 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: Change macro to function and moved to better file 



This patch fixes the checkpatch.pl warning like:
- CHECK: Macro argument reuse 'uVar' - possible side-effects?
Moved the only twice used function to the file where it is used.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fa37dde640cfe5093ff23ca0881aba4673751a49.1645477326.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac1569b7

drivers/staging/vt6656/device.h

+0 −7
Original line number Diff line number Diff line
@@ -381,13 +381,6 @@ struct vnt_private { 
	struct ieee80211_low_level_stats low_stats;

};



#define ADD_ONE_WITH_WRAP_AROUND(var, modulo) {	\

	if ((var) >= ((modulo) - 1))			\

		(var) = 0;				\

	else						\

		(var)++;				\

}



int vnt_init(struct vnt_private *priv);



#endif

drivers/staging/vt6656/wcmd.c

+11 −2
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ static void vnt_cmd_timer_wait(struct vnt_private *priv, unsigned long msecs) 
	schedule_delayed_work(&priv->run_command_work, msecs_to_jiffies(msecs));

}



static u32 add_one_with_wrap_around(u32 var, u8 modulo)

{

	if (var >= (modulo - 1))

		var = 0;

	else

		var++;

	return var;

}



static int vnt_cmd_complete(struct vnt_private *priv)

{

	priv->command_state = WLAN_CMD_IDLE;
@@ -42,7 +51,7 @@ static int vnt_cmd_complete(struct vnt_private *priv) 


	priv->command = priv->cmd_queue[priv->cmd_dequeue_idx];



	ADD_ONE_WITH_WRAP_AROUND(priv->cmd_dequeue_idx, CMD_Q_SIZE);

	priv->cmd_dequeue_idx = add_one_with_wrap_around(priv->cmd_dequeue_idx, CMD_Q_SIZE);

	priv->free_cmd_queue++;

	priv->cmd_running = true;
@@ -157,7 +166,7 @@ int vnt_schedule_command(struct vnt_private *priv, enum vnt_cmd command) 


	priv->cmd_queue[priv->cmd_enqueue_idx] = command;



	ADD_ONE_WITH_WRAP_AROUND(priv->cmd_enqueue_idx, CMD_Q_SIZE);

	priv->cmd_enqueue_idx = add_one_with_wrap_around(priv->cmd_enqueue_idx, CMD_Q_SIZE);

	priv->free_cmd_queue--;



	if (!priv->cmd_running)