leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: ff_memless - convert to using timer_setup()

Browse Source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Kees Cook 2017-10-19 17:22:46 -07:00 committed by Dmitry Torokhov
parent 17a58edc79
commit 34445d4b38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/ff-memless.c
View File

@ -412,10 +412,10 @@ static void ml_play_effects(struct ml_device *ml)
ml_schedule_timer(ml); ml_schedule_timer(ml);
} }
static void ml_effect_timer(unsigned long timer_data) static void ml_effect_timer(struct timer_list *t)
{ {
struct input_dev *dev = (struct input_dev *)timer_data; struct ml_device *ml = from_timer(ml, t, timer);
struct ml_device *ml = dev->ff->private; struct input_dev *dev = ml->dev;
unsigned long flags; unsigned long flags;
pr_debug("timer: updating effects\n"); pr_debug("timer: updating effects\n");
@ -526,7 +526,7 @@ int input_ff_create_memless(struct input_dev *dev, void *data,
ml->private = data; ml->private = data;
ml->play_effect = play_effect; ml->play_effect = play_effect;
ml->gain = 0xffff; ml->gain = 0xffff;
setup_timer(&ml->timer, ml_effect_timer, (unsigned long)dev); timer_setup(&ml->timer, ml_effect_timer, 0);
set_bit(FF_GAIN, dev->ffbit); set_bit(FF_GAIN, dev->ffbit);