Path: csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod From: Geliang Tang Newsgroups: linux.kernel Subject: [PATCH 05/12] [media] ivtv: use setup_timer Date: Sun, 09 Apr 2017 03:40:01 +0200 Message-ID: References: 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=AV8yCmLNJfDSSjAdWERfxgFg15Ph/X0x/SbiU9O7tM4=; b=cdPcFD/OH7Y9cllWQuDICDqJ/uWcZCL1byV/9U+VWD5i0Sp1800NHpqFVxRjQ4iu9E qaNQRdJFZga5Gt2yYCPOQVxqkhzKy2V1kVSvHkdde0B1k4T10dnkJ2eNCXmBCSgNGleN rvg2b7IZNJvA40w6sYKTT0eo/QUvnVvJKLEgnnqE6bihjdvrHIboGTB5a9lgk71mHYoe FMt5SOB/8nB5ZRFf1OLoszNbiBDxdHqJKU+jM7nMtVnpc8NiOitET6ong+TyK/wktYvh REUMUg5lXc32RhFK5crK0/IMJ68ome7MDry3JxQ5h1YMW6nayqmnhWMwfG0yx4k4FSPd J+qw== 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=AV8yCmLNJfDSSjAdWERfxgFg15Ph/X0x/SbiU9O7tM4=; b=UJ721s8rhnWwuLzhpAEDpbpmm3tPbp63VMg1hT4yUhXD8NBECCS5qnFxI4AU0xo9O1 K+LOIUP5/EiPeXyFSTGjmVzDI7zSbgzJx5JAesdoynalQIR6xDWImSP/j+TA0bkpHP4x 2Nsl85ewMdlBE7ifdRGah9inHIOpfMNIQgiBft4pIg9QRDxeCJYRmBO/gpuXnnvfwuV4 TRBjsVbheDo1sLv0cSUq5hHJCUlEqmT0J5RgF9RjOo1oWPqbh90zFxe6ZJQvccOg2HuF dpZjFo0XV4r7EOtNXccxzWaROf0bN5c7XBgcyi+44kpRu1S98cjFN/WH3HyJE3TZ7Nyz xDag== X-Gm-Message-State: AFeK/H1SOMB/7MUPEhDhJkY+nr687vzMy5OCpD86BmW0iYw8TsvDrYiA+9zpLNRHBrslUw== X-Received: by 10.99.56.66 with SMTP id h2mr40472722pgn.40.1491701681914; Sat, 08 Apr 2017 18:34:41 -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: 25 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:34:01 +0800 X-Original-Message-ID: <04fad03e4691fdbc040f62cd0545b5a5b662eab8.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:1619416 Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- 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