Commit 64979ac2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Hans Verkuil
Browse files

media: atmel-isi: 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.

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

drivers/media/platform/atmel/atmel-isi.c

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static irqreturn_t isi_interrupt(int irq, void *dev_id) 
#define	WAIT_ISI_DISABLE	0

static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)

{

	unsigned long timeout;

	unsigned long time_left;

	/*

	 * The reset or disable will only succeed if we have a

	 * pixel clock from the camera.
@@ -257,9 +257,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset) 
		isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);

	}



	timeout = wait_for_completion_timeout(&isi->complete,

	time_left = wait_for_completion_timeout(&isi->complete,

						msecs_to_jiffies(500));

	if (timeout == 0)

	if (time_left == 0)

		return -ETIMEDOUT;



	return 0;