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

media: fimc-is: use 'time_left' variable with wait_event_timeout() 



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

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

with all kinds of permutations. Use 'time_left' as a variable to make the
code self explaining.

Fix to the proper variable type 'long' while here.

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

drivers/media/platform/samsung/exynos4-is/fimc-core.c

+5 −5
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static int fimc_clk_get(struct fimc_dev *fimc) 
static int fimc_m2m_suspend(struct fimc_dev *fimc)

{

	unsigned long flags;

	int timeout;

	long time_left;



	spin_lock_irqsave(&fimc->slock, flags);

	if (!fimc_m2m_pending(fimc)) {
@@ -833,12 +833,12 @@ static int fimc_m2m_suspend(struct fimc_dev *fimc) 
	set_bit(ST_M2M_SUSPENDING, &fimc->state);

	spin_unlock_irqrestore(&fimc->slock, flags);



	timeout = wait_event_timeout(fimc->irq_queue,

	time_left = wait_event_timeout(fimc->irq_queue,

				       test_bit(ST_M2M_SUSPENDED, &fimc->state),

				       FIMC_SHUTDOWN_TIMEOUT);



	clear_bit(ST_M2M_SUSPENDING, &fimc->state);

	return timeout == 0 ? -EAGAIN : 0;

	return time_left == 0 ? -EAGAIN : 0;

}



static int fimc_m2m_resume(struct fimc_dev *fimc)