Commit 0016b5a5 authored by Wolfram Sang's avatar Wolfram Sang Committed by Hans Verkuil
Browse files

media: allegro: use 'time_left' variable with wait_for_completion_timeout() 



There is a confusing pattern in the kernel to use a variable named
'timeout' to store the result of wait_for_completion_timeout() causing
patterns like:

        timeout = wait_for_completion_timeout(...)
        if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the
code self explaining, also for the code path using 'tmo' as a variable.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent ec1d98e9

drivers/media/platform/allegro-dvt/allegro-core.c

+12 −12
Original line number Diff line number Diff line
@@ -1415,11 +1415,11 @@ static int allegro_mcu_send_encode_frame(struct allegro_dev *dev, 
static int allegro_mcu_wait_for_init_timeout(struct allegro_dev *dev,

					     unsigned long timeout_ms)

{

	unsigned long tmo;

	unsigned long time_left;



	tmo = wait_for_completion_timeout(&dev->init_complete,

	time_left = wait_for_completion_timeout(&dev->init_complete,

						msecs_to_jiffies(timeout_ms));

	if (tmo == 0)

	if (time_left == 0)

		return -ETIMEDOUT;



	reinit_completion(&dev->init_complete);
@@ -2481,14 +2481,14 @@ static void allegro_mcu_interrupt(struct allegro_dev *dev) 
static void allegro_destroy_channel(struct allegro_channel *channel)

{

	struct allegro_dev *dev = channel->dev;

	unsigned long timeout;

	unsigned long time_left;



	if (channel_exists(channel)) {

		reinit_completion(&channel->completion);

		allegro_mcu_send_destroy_channel(dev, channel);

		timeout = wait_for_completion_timeout(&channel->completion,

		time_left = wait_for_completion_timeout(&channel->completion,

							msecs_to_jiffies(5000));

		if (timeout == 0)

		if (time_left == 0)

			v4l2_warn(&dev->v4l2_dev,

				  "channel %d: timeout while destroying\n",

				  channel->mcu_channel_id);
@@ -2544,7 +2544,7 @@ static void allegro_destroy_channel(struct allegro_channel *channel) 
static int allegro_create_channel(struct allegro_channel *channel)

{

	struct allegro_dev *dev = channel->dev;

	unsigned long timeout;

	unsigned long time_left;



	if (channel_exists(channel)) {

		v4l2_warn(&dev->v4l2_dev,
@@ -2595,9 +2595,9 @@ static int allegro_create_channel(struct allegro_channel *channel) 


	reinit_completion(&channel->completion);

	allegro_mcu_send_create_channel(dev, channel);

	timeout = wait_for_completion_timeout(&channel->completion,

	time_left = wait_for_completion_timeout(&channel->completion,

						msecs_to_jiffies(5000));

	if (timeout == 0)

	if (time_left == 0)

		channel->error = -ETIMEDOUT;

	if (channel->error)

		goto err;