media: Switch to use hrtimer_setup()

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.

Patch was created by using Coccinelle.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Zack Rusin <zack.rusin@broadcom.com>
Link: https://lore.kernel.org/all/c725ad8d0ecac3cf6bbc532af567e56d47a6b75c.1738746904.git.namcao@linutronix.de

diff --git a/drivers/media/cec/core/cec-pin.c b/drivers/media/cec/core/cec-pin.c
index a70451d99ebc9612bda9b4cd67209c2d7c627dca..bebaa40e0eb51fc05ddd7601881e4e64ca9c3602 100644 (file)
--- a/drivers/media/cec/core/cec-pin.c
+++ b/drivers/media/cec/core/cec-pin.c
@@ -1346,9 +1346,8 @@ struct cec_adapter *cec_pin_allocate_adapter(const struct cec_pin_ops *pin_ops,
        if (pin == NULL)
                return ERR_PTR(-ENOMEM);
        pin->ops = pin_ops;
-       hrtimer_init(&pin->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        atomic_set(&pin->work_pin_num_events, 0);
-       pin->timer.function = cec_pin_timer;
+       hrtimer_setup(&pin->timer, cec_pin_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        init_waitqueue_head(&pin->kthread_waitq);
        pin->tx_custom_low_usecs = CEC_TIM_CUSTOM_DEFAULT;
        pin->tx_custom_high_usecs = CEC_TIM_CUSTOM_DEFAULT;

diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index a04a1d33fadb1b6bdb8306e521a3845a5a0d4823..b9f2c14d62b4086c386e17fb7602974f2d4c13e4 100644 (file)
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -190,8 +190,7 @@ static int __cx88_ir_start(void *priv)
        ir = core->ir;
 
        if (ir->polling) {
-               hrtimer_init(&ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-               ir->timer.function = cx88_ir_work;
+               hrtimer_setup(&ir->timer, cx88_ir_work, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
                hrtimer_start(&ir->timer,
                              ktime_set(0, ir->polling * 1000000),
                              HRTIMER_MODE_REL);

diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
index d1320298a0f7670ebf3978047ada32f8ffb7ce46..8479dc9c9a8fb4e7a7f7e9ef961cc316fb4700ae 100644 (file)
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
@@ -269,8 +269,8 @@ static int wave5_vpu_probe(struct platform_device *pdev)
        dev->irq = platform_get_irq(pdev, 0);
        if (dev->irq < 0) {
                dev_err(&pdev->dev, "failed to get irq resource, falling back to polling\n");
-               hrtimer_init(&dev->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
-               dev->hrtimer.function = &wave5_vpu_timer_callback;
+               hrtimer_setup(&dev->hrtimer, &wave5_vpu_timer_callback, CLOCK_MONOTONIC,
+                             HRTIMER_MODE_REL_PINNED);
                dev->worker = kthread_run_worker(0, "vpu_irq_thread");
                if (IS_ERR(dev->worker)) {
                        dev_err(&pdev->dev, "failed to create vpu irq worker\n");

diff --git a/drivers/media/rc/pwm-ir-tx.c b/drivers/media/rc/pwm-ir-tx.c
index fe368aebbc139a01d186cad4d25700a10f4c8215..84533fdd61aa6ce3c0f8593aaefe5919fd05c7f9 100644 (file)
--- a/drivers/media/rc/pwm-ir-tx.c
+++ b/drivers/media/rc/pwm-ir-tx.c
@@ -172,8 +172,7 @@ static int pwm_ir_probe(struct platform_device *pdev)
                rcdev->tx_ir = pwm_ir_tx_sleep;
        } else {
                init_completion(&pwm_ir->tx_done);
-               hrtimer_init(&pwm_ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-               pwm_ir->timer.function = pwm_ir_timer;
+               hrtimer_setup(&pwm_ir->timer, pwm_ir_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
                rcdev->tx_ir = pwm_ir_tx_atomic;
        }