mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-20 07:09:58 +00:00
media: bdisp: 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: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
64979ac2aa
commit
9b2bf29410
@ -1160,7 +1160,7 @@ static void bdisp_irq_timeout(struct work_struct *ptr)
|
||||
static int bdisp_m2m_suspend(struct bdisp_dev *bdisp)
|
||||
{
|
||||
unsigned long flags;
|
||||
int timeout;
|
||||
long time_left;
|
||||
|
||||
spin_lock_irqsave(&bdisp->slock, flags);
|
||||
if (!test_bit(ST_M2M_RUNNING, &bdisp->state)) {
|
||||
@ -1171,13 +1171,13 @@ static int bdisp_m2m_suspend(struct bdisp_dev *bdisp)
|
||||
set_bit(ST_M2M_SUSPENDING, &bdisp->state);
|
||||
spin_unlock_irqrestore(&bdisp->slock, flags);
|
||||
|
||||
timeout = wait_event_timeout(bdisp->irq_queue,
|
||||
test_bit(ST_M2M_SUSPENDED, &bdisp->state),
|
||||
BDISP_WORK_TIMEOUT);
|
||||
time_left = wait_event_timeout(bdisp->irq_queue,
|
||||
test_bit(ST_M2M_SUSPENDED, &bdisp->state),
|
||||
BDISP_WORK_TIMEOUT);
|
||||
|
||||
clear_bit(ST_M2M_SUSPENDING, &bdisp->state);
|
||||
|
||||
if (!timeout) {
|
||||
if (!time_left) {
|
||||
dev_err(bdisp->dev, "%s IRQ timeout\n", __func__);
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user