Path: csiph.com!xmission!weretis.net!feeder4.news.weretis.net!feeds.phibee-telecom.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Geliang Tang Newsgroups: linux.kernel Subject: [PATCH 01/12] [media] saa7134: use setup_timer Date: Sun, 09 Apr 2017 03:40:02 +0200 Message-ID: X-Original-To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xvsxZ5Q0XAsQ/bVTnL23/3wvpGrQ2DELNLYqc/CZX0s=; b=VPFXmBLCQl4rT42UMAJlqhe2L6RCyln6UMEyFxf/gCT0Hm4RwJC4+7b56AEnRsn38F P5U8/qBZjMEldmhWQU3SL9Wywz5VfT8T7opLci2ZgavrQ4K+nZG+x73sCGMVxC2NDCgY TxJm+E8XDByTw61jBYB5khmeC7taTKF/5vi3y25A6z+hlQ6FNy5JFIsLA4JP+Cduzq0e ZhiW3TWuMtX8Gu+B6zpn6fHK2tqKPeHuhgKLDem5BegTPctldS4MaIwEgRbHFor8A35U 62GfFoafhqhw2XzXbf/S2FGWU/CtaE5k4gU23TT0dFQVYOyGRyrN2QtEfHanLUqWltAv RokQ== 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; bh=xvsxZ5Q0XAsQ/bVTnL23/3wvpGrQ2DELNLYqc/CZX0s=; b=pS84+nwnvayHFhtQuZZWUD1cpkV30yYJqOYb67U8wu5LGUunlBv+mJ2jLpcC6fe6xU agPsE2H2gL3IVWI/i8iAa//v2/p2FqMH/OYSt8CK60ef/VsTRToBnwq8vPdGwRYnBGVn a12cRGZeYJtgZd0YEDniKh/ous2vAKU2EuIJd501xPYbLFwPJBL4YFp70EX/N2NQruby f9PM1hrNQyJNc+va2tpp/phmA5M5RCw6Scb1hBxcVl2KFG5+KkiaHL8ZUmQ4eTMucXY2 jDFbYYqwx3seTwWuHCbWGUBbeuEgeDRJFCBvEyP21Vlx9cBwByBbneI3xl80dZ3ydvkv rJWg== X-Gm-Message-State: AN3rC/7qT5NpAC78XiHm2BWpHyzLODgO3Y0peQb8shYQlSwoSl53XiT/n7Z72W+vJ1SJBw== X-Received: by 10.98.63.85 with SMTP id m82mr6356550pfa.143.1491701656530; Sat, 08 Apr 2017 18:34:16 -0700 (PDT) X-Mailer: git-send-email 2.9.3 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 59 Organization: linux.* mail to news gateway X-Original-Cc: Geliang Tang , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org X-Original-Date: Sun, 9 Apr 2017 09:33:57 +0800 X-Original-Message-ID: <77c0fb26d214e023a99afc948c71d6edd9284205.1490953290.git.geliangtang@gmail.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1619423 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(&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