[PATCH 01/12] [media] saa7134: use setup_timer

[Geliang Tang]

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

Signed-off-by: Geliang Tang 
---
 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(>ts_q.queue);
-   init_timer(>ts_q.timeout);
-   dev->ts_q.timeout.function = saa7134_buffer_timeout;
-   dev->ts_q.timeout.data = (unsigned long)(>ts_q);
+   setup_timer(>ts_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>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(>vbi_q.queue);
-   init_timer(>vbi_q.timeout);
-   dev->vbi_q.timeout.function = saa7134_buffer_timeout;
-   dev->vbi_q.timeout.data = (unsigned long)(>vbi_q);
+   setup_timer(>vbi_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>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(>video_q.queue);
-   init_timer(>video_q.timeout);
-   dev->video_q.timeout.function = saa7134_buffer_timeout;
-   dev->video_q.timeout.data = (unsigned long)(>video_q);
+   setup_timer(>video_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>video_q));
dev->video_q.dev  = dev;
dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
dev->width= 720;
-- 
2.9.3

[PATCH 01/12] [media] saa7134: use setup_timer

[Geliang Tang]

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

Signed-off-by: Geliang Tang 
---
 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(>ts_q.queue);
-   init_timer(>ts_q.timeout);
-   dev->ts_q.timeout.function = saa7134_buffer_timeout;
-   dev->ts_q.timeout.data = (unsigned long)(>ts_q);
+   setup_timer(>ts_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>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(>vbi_q.queue);
-   init_timer(>vbi_q.timeout);
-   dev->vbi_q.timeout.function = saa7134_buffer_timeout;
-   dev->vbi_q.timeout.data = (unsigned long)(>vbi_q);
+   setup_timer(>vbi_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>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(>video_q.queue);
-   init_timer(>video_q.timeout);
-   dev->video_q.timeout.function = saa7134_buffer_timeout;
-   dev->video_q.timeout.data = (unsigned long)(>video_q);
+   setup_timer(>video_q.timeout, saa7134_buffer_timeout,
+   (unsigned long)(>video_q));
dev->video_q.dev  = dev;
dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
dev->width= 720;
-- 
2.9.3