Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1619419

[PATCH 06/12] [media] netup_unidvb: use setup_timer

Path csiph.com!news.redatomik.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From Geliang Tang <geliangtang@gmail.com>
Newsgroups linux.kernel
Subject [PATCH 06/12] [media] netup_unidvb: use setup_timer
Date Sun, 09 Apr 2017 03:40:02 +0200
Message-ID <tu9ZE-4FS-13@gated-at.bofh.it> (permalink)
References <tu9ZD-4FS-3@gated-at.bofh.it>
X-Original-To Sergey Kozlov <serjk@netup.ru>, Abylay Ospan <aospan@netup.ru>, 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=4/IZXohhUihaPD8uF3xhxEO92Z5xIhOTd4cQNnCKZiU=; b=pEZ4h6SlcKKWLRtZWw2QoLONraVldreTz8h6WgWm6biWzv0lhrM38qe+dA1IzzZb1t /CpciJcYm9tJMHcyYaFW3ysT4vVSkl14FIqGrk2OTv7RACGnpwDb/R4QdOM5ewes2aGi fBwEM0nRXSdr2dCV7Yw7KGH1abroUfhU1JfF0Lajy1ASCiec81xawUlf2F6YRFmBQQB0 ELAC2GxXqjrxb8duX8vW08ZVd3eRoR30wz8l7cgGDMpGiNpwSik3942p3MYDJ2i86Blm v57XcGfs8a77i33jftVCajIP2wmoC0dl5pAt4bsAvaivfWIxe6+nfhrXPrkC39+ODvfA nihQ==
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=4/IZXohhUihaPD8uF3xhxEO92Z5xIhOTd4cQNnCKZiU=; b=ZDuYFlWXsHsZO6L1ij+7G4EM4GS7dfdEO5yXM1Sh6p2mkZRB/lGyzXCQw9Q/yvRc6c q9KBFXYOppxE2H7R73QCYWduwcJrlO5mxwlDso1GJUQvVGzPZ5PtHQNd7wD6KZ6aEuaR MYcLMM9tJDtRJ9da76/gv6gnIiGCWL7t2ry5EId5BBg8xFyZMxB5KMMpnRxYsT+Xmsdj MJ5B5WuaZ41UgnxUyk3dqN53+HkRcFrvYLIyUNHAiQsaxnR8Cr5ggu/MqWKBJnsz2kzu 6zc69Hnl/zXp39tgnnIRjzwZWYhHJTJkOUfw+TacEsK6WsBaL/JrMOCDQiD7nMTU6bhW 5PlQ==
X-Gm-Message-State AFeK/H0nVsK16beffpvDWkP1ewlmUY763RN+CDqLQM0QkoAFvzIA+jb4YAiV+eFj4qB3Sw==
X-Received by 10.99.119.140 with SMTP id s134mr48303675pgc.162.1491701687463; Sat, 08 Apr 2017 18:34:47 -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 25
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:34:02 +0800
X-Original-Message-ID <e7144ce822e4c235cfd6c41e11b64b638bc11fa7.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:1619419

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/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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread


Thread

[PATCH 06/12] [media] netup_unidvb: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-09 03:40 +0200

csiph-web