Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7440b0e authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

mfd: use shorter set_current_state() 



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: default avatarRobert 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 61711f8f

drivers/mfd/ucb1x00-ts.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

		}