Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1619424
| Path | csiph.com!1.us.feeder.erje.net!2.us.feeder.erje.net!feeder.erje.net!1.eu.feeder.erje.net!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Geliang Tang <geliangtang@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 02/12] [media] saa7146: use setup_timer |
| Date | Sun, 09 Apr 2017 03:40:02 +0200 |
| Message-ID | <tu9ZE-4FS-27@gated-at.bofh.it> (permalink) |
| References | <tu9ZD-4FS-3@gated-at.bofh.it> |
| X-Original-To | Hans Verkuil <hverkuil@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=4r3w/aZ1bi9+fl7lYgoSUOYGX5VNcJHi5VtwoPKV+6s=; b=rIpIZ6YC0BXx3Ujgqo3T1rn6WIX1ErsOX7tO8HYSOvJEFmQsfz8tjHI5GJvFbY9yd4 br3Gs29kxssA02A6UjzYDcKlpP8wMAbpefs2r2OEgnps99hOueTIBDz/My1ddNFm4x+j Dsw1a8Kf82Tl+R9+JW7F9OM/y2yjJ0OPZ80LL6uqWrhqbvST8mZbpMrs33P98l8G+S7h MwtU/Qfl13o+k3oYRC8VSLf4riW8VDVaWmwSaS+UpWhLDVWi3gCzuUl1BYFAnFqBPtKk MUQ2USgeUW9pYMX3S7qgqOD6c037fvDpRfNSonOxTN56J7XmzzjAVN6UsSjnCOL3Ht7O kd5A== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=4r3w/aZ1bi9+fl7lYgoSUOYGX5VNcJHi5VtwoPKV+6s=; b=Oq4zHPhhBJdlJh7tTrN5HLxE80VLQ+W8Rc/VjdfKifmAa1RXMEwWQl0MhM4lkoMuJV 2FJJj4wJ31MqlGxGB+Q/E9gKGeVwmXGal0E0frygXzi286MU0mVDzKXdRcXHEjCwlSFd Uz1sxS2BTjJiZRndCv924uzcreDwrBB3/9SP9MjF0X3kkqTkqOk5C09R28dgqjeMbnQq +OZdpb/mw/VEM/BFHLAjnaAA/Zx4EvU4QW1wcoSS8O25ExEYOOpZgV8arO71Hb3Jn+Xy y2vDEcnVHtk/wRGC/NG6ZfmAge3C4Hh4vpELDvs5Ur9xYmrUQCHV0nzl4Wk3OKYV33KN TDWA== |
| X-Gm-Message-State | AFeK/H3bBzvIoBt/cNFiNV9jYEougl++moZMDcLlDrlhtLv8ANv2qVBNibsKG1KQdOEr3w== |
| X-Received | by 10.98.80.208 with SMTP id g77mr46943867pfj.249.1491701665355; Sat, 08 Apr 2017 18:34:25 -0700 (PDT) |
| X-Mailer | git-send-email 2.9.3 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 42 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Geliang Tang <geliangtang@gmail.com>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org |
| X-Original-Date | Sun, 9 Apr 2017 09:33:58 +0800 |
| X-Original-Message-ID | <56788f7b11a8395f4c9914dab7d92f71e16390c0.1490953290.git.geliangtang@gmail.com> |
| X-Original-References | <77c0fb26d214e023a99afc948c71d6edd9284205.1490953290.git.geliangtang@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1619424 |
Show key headers only | View raw
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 01/12] [media] saa7134: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-09 03:40 +0200 [PATCH 02/12] [media] saa7146: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-09 03:40 +0200 [PATCH 04/12] [media] cx18: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-09 03:40 +0200 [PATCH 11/12] [media] wl128x: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-09 03:40 +0200
csiph-web