treewide: Convert new and leftover hrtimer_init() users

hrtimer_setup() takes the callback function pointer as argument and
initializes the timer completely.

Replace hrtimer_init() and the open coded initialization of
hrtimer::function with the new setup mechanism.

Coccinelle scripted cleanup.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
index 59eea813f258fa4d542f8f62b92e70b769f175e0..15370fb82317c45e3cc6d6cb59a5aa63e8b17c82 100644 (file)
--- a/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@ -232,8 +232,7 @@ static void walkera0701_attach(struct parport *pp)
                goto err_unregister_device;
        }
 
-       hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       w->timer.function = timer_handler;
+       hrtimer_setup(&w->timer, timer_handler, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 
        w->input_dev = input_allocate_device();
        if (!w->input_dev) {

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 5eef66516e379a73eff928458a98a27e6eb5dac0..5c39a217b94c8ad03a8542380eed741fccdca5da 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -590,9 +590,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
 
                INIT_DELAYED_WORK(&bdata->work, gpio_keys_gpio_work_func);
 
-               hrtimer_init(&bdata->debounce_timer,
-                            CLOCK_REALTIME, HRTIMER_MODE_REL);
-               bdata->debounce_timer.function = gpio_keys_debounce_timer;
+               hrtimer_setup(&bdata->debounce_timer, gpio_keys_debounce_timer,
+                             CLOCK_REALTIME, HRTIMER_MODE_REL);
 
                isr = gpio_keys_gpio_isr;
                irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
@@ -628,9 +627,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
                }
 
                bdata->release_delay = button->debounce_interval;
-               hrtimer_init(&bdata->release_timer,
-                            CLOCK_REALTIME, HRTIMER_MODE_REL_HARD);
-               bdata->release_timer.function = gpio_keys_irq_timer;
+               hrtimer_setup(&bdata->release_timer, gpio_keys_irq_timer,
+                             CLOCK_REALTIME, HRTIMER_MODE_REL_HARD);
 
                isr = gpio_keys_irq_isr;
                irqflags = 0;

diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index ddda0c1e7a6d454f7dd4a34340d3182e4857a26c..0e0321a7ddd7109cd36f5955c084e1fd8c58685c 100644 (file)
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -441,8 +441,8 @@ static enum hrtimer_restart nsim_napi_schedule(struct hrtimer *timer)
 
 static void nsim_rq_timer_init(struct nsim_rq *rq)
 {
-       hrtimer_init(&rq->napi_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       rq->napi_timer.function = nsim_napi_schedule;
+       hrtimer_setup(&rq->napi_timer, nsim_napi_schedule, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_REL);
 }
 
 static void nsim_enable_napi(struct netdevsim *ns)

diff --git a/drivers/pps/generators/pps_gen_tio.c b/drivers/pps/generators/pps_gen_tio.c
index 6c46b46c66cdda7ed25e752fe5b5dfed30c8e220..1d5ffe055463fcd0fe6ee1ba3cd74393f7334c04 100644 (file)
--- a/drivers/pps/generators/pps_gen_tio.c
+++ b/drivers/pps/generators/pps_gen_tio.c
@@ -227,8 +227,8 @@ static int pps_gen_tio_probe(struct platform_device *pdev)
                return PTR_ERR(tio->base);
 
        pps_tio_disable(tio);
-       hrtimer_init(&tio->timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
-       tio->timer.function = hrtimer_callback;
+       hrtimer_setup(&tio->timer, hrtimer_callback, CLOCK_REALTIME,
+                     HRTIMER_MODE_ABS);
        spin_lock_init(&tio->lock);
        platform_set_drvdata(pdev, &tio);