media: imx: use setup_timer

Use setup_timer function instead of initializing timer with the
function and data fields.

Generated by: scripts/coccinelle/api/setup_timer.cocci.

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Tested-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index fa2c120168b6a85d761d8d70f1d1b67402020410..0790b3d9e25560366a48633ddce37beeea21e762 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -1292,9 +1292,8 @@ static int prp_init(struct imx_ic_priv *ic_priv)
        priv->ic_priv = ic_priv;
 
        spin_lock_init(&priv->irqlock);
-       init_timer(&priv->eof_timeout_timer);
-       priv->eof_timeout_timer.data = (unsigned long)priv;
-       priv->eof_timeout_timer.function = prp_eof_timeout;
+       setup_timer(&priv->eof_timeout_timer, prp_eof_timeout,
+                   (unsigned long)priv);
 
        priv->vdev = imx_media_capture_device_init(&ic_priv->sd,
                                                   PRPENCVF_SRC_PAD);

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 552a030f3232a4aa7eddb20c14e3808a57e72fd7..6d856118c223285702913468b29200e26c448a7c 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1739,9 +1739,8 @@ static int imx_csi_probe(struct platform_device *pdev)
        priv->csi_id = pdata->csi;
        priv->smfc_id = (priv->csi_id == 0) ? 0 : 2;
 
-       init_timer(&priv->eof_timeout_timer);
-       priv->eof_timeout_timer.data = (unsigned long)priv;
-       priv->eof_timeout_timer.function = csi_idmac_eof_timeout;
+       setup_timer(&priv->eof_timeout_timer, csi_idmac_eof_timeout,
+                   (unsigned long)priv);
        spin_lock_init(&priv->irqlock);
 
        v4l2_subdev_init(&priv->sd, &csi_subdev_ops);