linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/12] [media] saa7134: use setup_timer
@ 2017-04-09  1:33 Geliang Tang
  2017-04-09  1:33 ` [PATCH 02/12] [media] saa7146: " Geliang Tang
                   ` (10 more replies)
  0 siblings, 11 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:33 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/saa7134/saa7134-ts.c    | 5 ++---
 drivers/media/pci/saa7134/saa7134-vbi.c   | 5 ++---
 drivers/media/pci/saa7134/saa7134-video.c | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 578e03f..7414878 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -223,9 +223,8 @@ int saa7134_ts_init1(struct saa7134_dev *dev)
 	dev->ts.nr_packets = ts_nr_packets;
 
 	INIT_LIST_HEAD(&dev->ts_q.queue);
-	init_timer(&dev->ts_q.timeout);
-	dev->ts_q.timeout.function = saa7134_buffer_timeout;
-	dev->ts_q.timeout.data     = (unsigned long)(&dev->ts_q);
+	setup_timer(&dev->ts_q.timeout, saa7134_buffer_timeout,
+		    (unsigned long)(&dev->ts_q));
 	dev->ts_q.dev              = dev;
 	dev->ts_q.need_two         = 1;
 	dev->ts_started            = 0;
diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index 4619337..bcad9b2 100644
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -181,9 +181,8 @@ struct vb2_ops saa7134_vbi_qops = {
 int saa7134_vbi_init1(struct saa7134_dev *dev)
 {
 	INIT_LIST_HEAD(&dev->vbi_q.queue);
-	init_timer(&dev->vbi_q.timeout);
-	dev->vbi_q.timeout.function = saa7134_buffer_timeout;
-	dev->vbi_q.timeout.data     = (unsigned long)(&dev->vbi_q);
+	setup_timer(&dev->vbi_q.timeout, saa7134_buffer_timeout,
+		    (unsigned long)(&dev->vbi_q));
 	dev->vbi_q.dev              = dev;
 
 	if (vbibufs < 2)
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 4b1c432..51d42bb 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2145,9 +2145,8 @@ int saa7134_video_init1(struct saa7134_dev *dev)
 	dev->automute       = 0;
 
 	INIT_LIST_HEAD(&dev->video_q.queue);
-	init_timer(&dev->video_q.timeout);
-	dev->video_q.timeout.function = saa7134_buffer_timeout;
-	dev->video_q.timeout.data     = (unsigned long)(&dev->video_q);
+	setup_timer(&dev->video_q.timeout, saa7134_buffer_timeout,
+		    (unsigned long)(&dev->video_q));
 	dev->video_q.dev              = dev;
 	dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
 	dev->width    = 720;
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 02/12] [media] saa7146: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
@ 2017-04-09  1:33 ` Geliang Tang
  2017-04-09  1:33 ` [PATCH 03/12] [media] bt8xx: " Geliang Tang
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:33 UTC (permalink / raw)
  To: Hans Verkuil, Mauro Carvalho Chehab
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/common/saa7146/saa7146_vbi.c   | 5 ++---
 drivers/media/common/saa7146/saa7146_video.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c
index 4923751..3553ac4 100644
--- a/drivers/media/common/saa7146/saa7146_vbi.c
+++ b/drivers/media/common/saa7146/saa7146_vbi.c
@@ -365,9 +365,8 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 
 	INIT_LIST_HEAD(&vv->vbi_dmaq.queue);
 
-	init_timer(&vv->vbi_dmaq.timeout);
-	vv->vbi_dmaq.timeout.function = saa7146_buffer_timeout;
-	vv->vbi_dmaq.timeout.data     = (unsigned long)(&vv->vbi_dmaq);
+	setup_timer(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout,
+		    (unsigned long)(&vv->vbi_dmaq));
 	vv->vbi_dmaq.dev              = dev;
 
 	init_waitqueue_head(&vv->vbi_wq);
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
index e034bcf..b3b29d4 100644
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/media/common/saa7146/saa7146_video.c
@@ -1201,9 +1201,8 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
 	INIT_LIST_HEAD(&vv->video_dmaq.queue);
 
-	init_timer(&vv->video_dmaq.timeout);
-	vv->video_dmaq.timeout.function = saa7146_buffer_timeout;
-	vv->video_dmaq.timeout.data     = (unsigned long)(&vv->video_dmaq);
+	setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout,
+		    (unsigned long)(&vv->video_dmaq));
 	vv->video_dmaq.dev              = dev;
 
 	/* set some default values */
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 03/12] [media] bt8xx: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
  2017-04-09  1:33 ` [PATCH 02/12] [media] saa7146: " Geliang Tang
@ 2017-04-09  1:33 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 04/12] [media] cx18: " Geliang Tang
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:33 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Hans Verkuil
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/bt8xx/bttv-driver.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index fb4aefb..ed319f1 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4043,9 +4043,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
 	INIT_LIST_HEAD(&btv->capture);
 	INIT_LIST_HEAD(&btv->vcapture);
 
-	init_timer(&btv->timeout);
-	btv->timeout.function = bttv_irq_timeout;
-	btv->timeout.data     = (unsigned long)btv;
+	setup_timer(&btv->timeout, bttv_irq_timeout, (unsigned long)btv);
 
 	btv->i2c_rc = -1;
 	btv->tuner_type  = UNSET;
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 04/12] [media] cx18: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
  2017-04-09  1:33 ` [PATCH 02/12] [media] saa7146: " Geliang Tang
  2017-04-09  1:33 ` [PATCH 03/12] [media] bt8xx: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 05/12] [media] ivtv: " Geliang Tang
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Andy Walls, Mauro Carvalho Chehab; +Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/cx18/cx18-streams.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index 7c93814..3c45e007 100644
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -282,9 +282,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
 	INIT_WORK(&s->out_work_order, cx18_out_work_handler);
 
 	INIT_LIST_HEAD(&s->vb_capture);
-	s->vb_timeout.function = cx18_vb_timeout;
-	s->vb_timeout.data = (unsigned long)s;
-	init_timer(&s->vb_timeout);
+	setup_timer(&s->vb_timeout, cx18_vb_timeout, (unsigned long)s);
 	spin_lock_init(&s->vb_lock);
 	if (type == CX18_ENC_STREAM_TYPE_YUV) {
 		spin_lock_init(&s->vbuf_q_lock);
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 05/12] [media] ivtv: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (2 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 04/12] [media] cx18: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 06/12] [media] netup_unidvb: " Geliang Tang
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Andy Walls, Mauro Carvalho Chehab; +Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/ivtv/ivtv-driver.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index a71a03e..e8fa99b 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -770,9 +770,8 @@ static int ivtv_init_struct1(struct ivtv *itv)
 	init_waitqueue_head(&itv->event_waitq);
 	init_waitqueue_head(&itv->vsync_waitq);
 	init_waitqueue_head(&itv->dma_waitq);
-	init_timer(&itv->dma_timer);
-	itv->dma_timer.function = ivtv_unfinished_dma;
-	itv->dma_timer.data = (unsigned long)itv;
+	setup_timer(&itv->dma_timer, ivtv_unfinished_dma,
+		    (unsigned long)itv);
 
 	itv->cur_dma_stream = -1;
 	itv->cur_pio_stream = -1;
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 06/12] [media] netup_unidvb: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (3 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 05/12] [media] ivtv: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 07/12] [media] av7110: " Geliang Tang
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Sergey Kozlov, Abylay Ospan, Mauro Carvalho Chehab
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 191bd82..9444483 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -663,9 +663,8 @@ static int netup_unidvb_dma_init(struct netup_unidvb_dev *ndev, int num)
 	spin_lock_init(&dma->lock);
 	INIT_WORK(&dma->work, netup_unidvb_dma_worker);
 	INIT_LIST_HEAD(&dma->free_buffers);
-	dma->timeout.function = netup_unidvb_dma_timeout;
-	dma->timeout.data = (unsigned long)dma;
-	init_timer(&dma->timeout);
+	setup_timer(&dma->timeout, netup_unidvb_dma_timeout,
+		    (unsigned long)dma);
 	dma->ring_buffer_size = ndev->dma_size / 2;
 	dma->addr_virt = ndev->dma_virt + dma->ring_buffer_size * num;
 	dma->addr_phys = (dma_addr_t)((u64)ndev->dma_phys +
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 07/12] [media] av7110: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (4 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 06/12] [media] netup_unidvb: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 08/12] [media] fsl-viu: " Geliang Tang
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Sakari Ailus
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/pci/ttpci/av7110_ir.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
index 10e28f0..ca05198 100644
--- a/drivers/media/pci/ttpci/av7110_ir.c
+++ b/drivers/media/pci/ttpci/av7110_ir.c
@@ -333,9 +333,8 @@ int av7110_ir_init(struct av7110 *av7110)
 	av_list[av_cnt++] = av7110;
 	av7110_check_ir_config(av7110, true);
 
-	init_timer(&av7110->ir.keyup_timer);
-	av7110->ir.keyup_timer.function = av7110_emit_keyup;
-	av7110->ir.keyup_timer.data = (unsigned long) &av7110->ir;
+	setup_timer(&av7110->ir.keyup_timer, av7110_emit_keyup,
+		    (unsigned long)&av7110->ir);
 
 	input_dev = input_allocate_device();
 	if (!input_dev)
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 08/12] [media] fsl-viu: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (5 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 07/12] [media] av7110: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 09/12] [media] s5p-mfc: " Geliang Tang
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Mauro Carvalho Chehab; +Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/platform/fsl-viu.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index ae8c6b3..97e164b 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1466,9 +1466,8 @@ static int viu_of_probe(struct platform_device *op)
 	viu_dev->decoder = v4l2_i2c_new_subdev(&viu_dev->v4l2_dev, ad,
 			"saa7113", VIU_VIDEO_DECODER_ADDR, NULL);
 
-	viu_dev->vidq.timeout.function = viu_vid_timeout;
-	viu_dev->vidq.timeout.data     = (unsigned long)viu_dev;
-	init_timer(&viu_dev->vidq.timeout);
+	setup_timer(&viu_dev->vidq.timeout, viu_vid_timeout,
+		    (unsigned long)viu_dev);
 	viu_dev->std = V4L2_STD_NTSC_M;
 	viu_dev->first = 1;
 
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 09/12] [media] s5p-mfc: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (6 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 08/12] [media] fsl-viu: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
       [not found]   ` <CGME20170410083414epcas5p401f39ae110afbae34e0f2c6b53bd86a3@epcas5p4.samsung.com>
  2017-04-09  1:34 ` [PATCH 10/12] [media] c8sectpfe: " Geliang Tang
                   ` (2 subsequent siblings)
  10 siblings, 1 reply; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Kyungmin Park, Kamil Debski, Jeongtae Park, Andrzej Hajda,
	Mauro Carvalho Chehab
  Cc: Geliang Tang, linux-arm-kernel, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/platform/s5p-mfc/s5p_mfc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index bb0a588..2c363aa 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1266,9 +1266,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 	dev->hw_lock = 0;
 	INIT_WORK(&dev->watchdog_work, s5p_mfc_watchdog_worker);
 	atomic_set(&dev->watchdog_cnt, 0);
-	init_timer(&dev->watchdog_timer);
-	dev->watchdog_timer.data = (unsigned long)dev;
-	dev->watchdog_timer.function = s5p_mfc_watchdog;
+	setup_timer(&dev->watchdog_timer, s5p_mfc_watchdog,
+		    (unsigned long)dev);
 
 	/* Initialize HW ops and commands based on MFC version */
 	s5p_mfc_init_hw_ops(dev);
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 10/12] [media] c8sectpfe: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (7 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 09/12] [media] s5p-mfc: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 11/12] [media] wl128x: " Geliang Tang
  2017-04-09  1:34 ` [PATCH 12/12] [media] imon: " Geliang Tang
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Patrice Chotard, Mauro Carvalho Chehab
  Cc: Geliang Tang, linux-arm-kernel, kernel, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 7652ce2..59280ac 100644
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -865,9 +865,8 @@ static int c8sectpfe_probe(struct platform_device *pdev)
 	}
 
 	/* Setup timer interrupt */
-	init_timer(&fei->timer);
-	fei->timer.function = c8sectpfe_timer_interrupt;
-	fei->timer.data = (unsigned long)fei;
+	setup_timer(&fei->timer, c8sectpfe_timer_interrupt,
+		    (unsigned long)fei);
 
 	mutex_init(&fei->lock);
 
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 11/12] [media] wl128x: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (8 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 10/12] [media] c8sectpfe: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  2017-04-09  1:34 ` [PATCH 12/12] [media] imon: " Geliang Tang
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Geert Uytterhoeven
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/radio/wl128x/fmdrv_common.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index 74a1b3e..588e2d6 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -1550,9 +1550,8 @@ int fmc_prepare(struct fmdev *fmdev)
 	atomic_set(&fmdev->tx_cnt, 1);
 	fmdev->resp_comp = NULL;
 
-	init_timer(&fmdev->irq_info.timer);
-	fmdev->irq_info.timer.function = &int_timeout_handler;
-	fmdev->irq_info.timer.data = (unsigned long)fmdev;
+	setup_timer(&fmdev->irq_info.timer, &int_timeout_handler,
+		    (unsigned long)fmdev);
 	/*TODO: add FM_STIC_EVENT later */
 	fmdev->irq_info.mask = FM_MAL_EVENT;
 
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 12/12] [media] imon: use setup_timer
  2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
                   ` (9 preceding siblings ...)
  2017-04-09  1:34 ` [PATCH 11/12] [media] wl128x: " Geliang Tang
@ 2017-04-09  1:34 ` Geliang Tang
  10 siblings, 0 replies; 13+ messages in thread
From: Geliang Tang @ 2017-04-09  1:34 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Wolfram Sang, Sean Young
  Cc: Geliang Tang, linux-media, linux-kernel

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/media/rc/imon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 89823d2..3489010 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2412,9 +2412,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
 	mutex_lock(&ictx->lock);
 
 	if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
-		init_timer(&ictx->ttimer);
-		ictx->ttimer.data = (unsigned long)ictx;
-		ictx->ttimer.function = imon_touch_display_timeout;
+		setup_timer(&ictx->ttimer, imon_touch_display_timeout,
+			    (unsigned long)ictx);
 	}
 
 	ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf));
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 13+ messages in thread
* Re: [PATCH 09/12] [media] s5p-mfc: use setup_timer
       [not found]   ` <CGME20170410083414epcas5p401f39ae110afbae34e0f2c6b53bd86a3@epcas5p4.samsung.com>
@ 2017-04-10  8:33     ` Sylwester Nawrocki
  0 siblings, 0 replies; 13+ messages in thread
From: Sylwester Nawrocki @ 2017-04-10  8:33 UTC (permalink / raw)
  To: Geliang Tang
  Cc: Kyungmin Park, Kamil Debski, Jeongtae Park, Andrzej Hajda,
	Mauro Carvalho Chehab, linux-kernel, linux-arm-kernel,
	linux-media

On 04/09/2017 03:34 AM, Geliang Tang wrote:
> Use setup_timer() instead of init_timer() to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-04-10  8:34 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-09  1:33 [PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang
2017-04-09  1:33 ` [PATCH 02/12] [media] saa7146: " Geliang Tang
2017-04-09  1:33 ` [PATCH 03/12] [media] bt8xx: " Geliang Tang
2017-04-09  1:34 ` [PATCH 04/12] [media] cx18: " Geliang Tang
2017-04-09  1:34 ` [PATCH 05/12] [media] ivtv: " Geliang Tang
2017-04-09  1:34 ` [PATCH 06/12] [media] netup_unidvb: " Geliang Tang
2017-04-09  1:34 ` [PATCH 07/12] [media] av7110: " Geliang Tang
2017-04-09  1:34 ` [PATCH 08/12] [media] fsl-viu: " Geliang Tang
2017-04-09  1:34 ` [PATCH 09/12] [media] s5p-mfc: " Geliang Tang
     [not found]   ` <CGME20170410083414epcas5p401f39ae110afbae34e0f2c6b53bd86a3@epcas5p4.samsung.com>
2017-04-10  8:33     ` Sylwester Nawrocki
2017-04-09  1:34 ` [PATCH 10/12] [media] c8sectpfe: " Geliang Tang
2017-04-09  1:34 ` [PATCH 11/12] [media] wl128x: " Geliang Tang
2017-04-09  1:34 ` [PATCH 12/12] [media] imon: " Geliang Tang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).