diff options
| author | Davidlohr Bueso <dave@stgolabs.net> | 2015-01-26 02:15:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-28 11:25:28 -0800 |
| commit | 2be90fef97ada3df61736435dc9ef6c3e432a747 (patch) | |
| tree | 3517dcb60259eb33da184442bbf757b0e28910ff /drivers/staging | |
| parent | 1167ff91da290cefc6e985c741dcab2a58c62452 (diff) | |
drivers/staging: use current->state helpers
Call __set_current_state() instead of assigning the new state directly.
These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments,
keeping track of who changed the state.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/me_daq.c | 2 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_utils.c | 2 | ||||
| -rw-r--r-- | drivers/staging/panel/panel.c | 2 | ||||
| -rw-r--r-- | drivers/staging/speakup/selection.c | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/include/timskmod.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index bffc16115510..92e23527f2cb 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -174,7 +174,7 @@ struct me_private_data { static inline void sleep(unsigned sec) { - current->state = TASK_INTERRUPTIBLE; + __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(sec * HZ); } diff --git a/drivers/staging/dgnc/dgnc_utils.c b/drivers/staging/dgnc/dgnc_utils.c index 61efc13ec160..80b51332292c 100644 --- a/drivers/staging/dgnc/dgnc_utils.c +++ b/drivers/staging/dgnc/dgnc_utils.c @@ -12,7 +12,7 @@ */ int dgnc_ms_sleep(ulong ms) { - current->state = TASK_INTERRUPTIBLE; + __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((ms * HZ) / 1000); return signal_pending(current); } diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 9c68ccf05bdf..6ed35b6ecf0d 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -780,7 +780,7 @@ static void long_sleep(int ms) if (in_interrupt()) { mdelay(ms); } else { - current->state = TASK_INTERRUPTIBLE; + __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((ms * HZ + 999) / 1000); } } diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c index 507fc9a1776e..a0315701c7d9 100644 --- a/drivers/staging/speakup/selection.c +++ b/drivers/staging/speakup/selection.c @@ -157,7 +157,7 @@ static void __speakup_paste_selection(struct work_struct *work) pasted += count; } remove_wait_queue(&vc->paste_wait, &wait); - current->state = TASK_RUNNING; + __set_current_state(TASK_RUNNING); tty_buffer_unlock_exclusive(&vc->port); tty_ldisc_deref(ld); diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h index cff7983dab85..4019a0d63645 100644 --- a/drivers/staging/unisys/include/timskmod.h +++ b/drivers/staging/unisys/include/timskmod.h @@ -133,7 +133,7 @@ * x - the number of seconds to sleep. */ #define SLEEP(x) \ - do { current->state = TASK_INTERRUPTIBLE; \ + do { __set_current_state(TASK_INTERRUPTIBLE); \ schedule_timeout((x)*HZ); \ } while (0) @@ -141,7 +141,7 @@ * x - the number of jiffies to sleep. */ #define SLEEPJIFFIES(x) \ - do { current->state = TASK_INTERRUPTIBLE; \ + do { __set_current_state(TASK_INTERRUPTIBLE); \ schedule_timeout(x); \ } while (0) |