mfd: use shorter set_current_state()
authorRobert P. J. Day <rpjday@crashcourse.ca>
Mon, 28 Apr 2008 09:14:24 +0000 (02:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 15:58:32 +0000 (08:58 -0700)
Since this routine declares a separate "tsk" pointer for no other reason than
to call set_task_state(), get rid of it and just invoke set_current_state().

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Nicolas Pitre <nico@cam.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/mfd/ucb1x00-ts.c

index 5e859486eaf851ea077501abf02d987a16d5a379..ad34e2d22524f5a7d96d4acd609c2b1c59dd454e 100644 (file)
@@ -204,8 +204,7 @@ static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts)
 static int ucb1x00_thread(void *_ts)
 {
        struct ucb1x00_ts *ts = _ts;
-       struct task_struct *tsk = current;
-       DECLARE_WAITQUEUE(wait, tsk);
+       DECLARE_WAITQUEUE(wait, current);
        int valid = 0;
 
        set_freezable();
@@ -234,7 +233,7 @@ static int ucb1x00_thread(void *_ts)
 
 
                if (ucb1x00_ts_pen_down(ts)) {
-                       set_task_state(tsk, TASK_INTERRUPTIBLE);
+                       set_current_state(TASK_INTERRUPTIBLE);
 
                        ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING);
                        ucb1x00_disable(ts->ucb);
@@ -262,7 +261,7 @@ static int ucb1x00_thread(void *_ts)
                                valid = 1;
                        }
 
-                       set_task_state(tsk, TASK_INTERRUPTIBLE);
+                       set_current_state(TASK_INTERRUPTIBLE);
                        timeout = HZ / 100;
                }