redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: ced1401: ced_ioc.c: remove else branch in ced_wait_event 

Fix checkpatch warning "else is not generally useful after a break or return" in
file ced_ioc.c, function ced_wait_event()

Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Luca Ellero 2014-07-11 16:56:47 +02:00 committed by Greg Kroah-Hartman
parent c626bd5b7b
commit 6cfa015217
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/staging/ced1401/ced_ioc.c
View File

@ -887,48 +887,49 @@ int ced_set_event(struct ced_data *ced, struct transfer_event __user *ute)
int ced_wait_event(struct ced_data *ced, int area, int time_out)
{
int ret;
int wait;
struct transarea *ta;
if ((unsigned)area >= MAX_TRANSAREAS)
return U14ERR_BADAREA;
else {
int wait;
struct transarea *ta = &ced->trans_def[area];
/* convert timeout to jiffies */
time_out = (time_out * HZ + 999) / 1000;
ta = &ced->trans_def[area];
/* We cannot wait holding the mutex, but we check the flags */
/* while holding it. This may well be pointless as another */
/* thread could get in between releasing it and the wait */
/* call. However, this would have to clear the wake_up flag. */
/* However, the !ta->used may help us in this case. */
/* convert timeout to jiffies */
time_out = (time_out * HZ + 999) / 1000;
/* make sure we have no competitor */
mutex_lock(&ced->io_mutex);
if (!ta->used || !ta->event_sz) /* check something to */
/* wait for... */
return U14ERR_NOTSET; /* ...else we do nothing */
mutex_unlock(&ced->io_mutex);
/* We cannot wait holding the mutex, but we check the flags */
/* while holding it. This may well be pointless as another */
/* thread could get in between releasing it and the wait */
/* call. However, this would have to clear the wake_up flag. */
/* However, the !ta->used may help us in this case. */
if (time_out)
wait = wait_event_interruptible_timeout(ta->event,
ta->wake_up ||
!ta->used,
time_out);
else
wait = wait_event_interruptible(ta->event,
/* make sure we have no competitor */
mutex_lock(&ced->io_mutex);
if (!ta->used || !ta->event_sz) /* check something to */
/* wait for... */
return U14ERR_NOTSET; /* ...else we do nothing */
mutex_unlock(&ced->io_mutex);
if (time_out)
wait = wait_event_interruptible_timeout(ta->event,
ta->wake_up ||
!ta->used);
!ta->used,
time_out);
else
wait = wait_event_interruptible(ta->event,
ta->wake_up ||
!ta->used);
if (wait)
ret = -ERESTARTSYS; /* oops - we have had a SIGNAL */
else
ret = ta->wake_up; /* else the wakeup count */
if (wait)
ret = -ERESTARTSYS; /* oops - we have had a SIGNAL */
else
ret = ta->wake_up; /* else the wakeup count */
spin_lock_irq(&ced->staged_lock);
ta->wake_up = 0; /* clear the flag */
spin_unlock_irq(&ced->staged_lock);
spin_lock_irq(&ced->staged_lock);
ta->wake_up = 0; /* clear the flag */
spin_unlock_irq(&ced->staged_lock);
}
return ret;
}