Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Geliang Tang Newsgroups: linux.kernel Subject: [PATCH 12/12] [media] imon: 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=NFXqEKJP0gyXD5wzXT6Lbq1dCq6+Q09JzmpDdG/eN0o=; b=ofsOYBidSPdsKhUhKUHGpuG9ckgK7YIHN4F42+259mkROMs4JiCkwl9z8f9ECMc5dl fs1mgh8YI3QDWy7Y3e8VsX+J3jgexiJMROK5BvBldmqsl6VGNreUpIeFtgDt6S2EZKrN UPhFWKxierwc72mWcIXDe0quJM3qkHOE8AEXcLJPCgJDtiMFdhmdJZvDsZTu6sSfOEi7 wHvi4gqa6E1KR7KPyT0U6nTJiGIlEDMn/dmAk+iI7/Ou3tdFv3sczp3ktLxMM89xiRH5 Bdl09pH+3Ul0dGISi/Q5YlAjltc6va/jRl/9cwGp37BfGq3XIJmPr/WhBWFdztwK+86v 2KFg== 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=NFXqEKJP0gyXD5wzXT6Lbq1dCq6+Q09JzmpDdG/eN0o=; b=OQFPA9tMo+Um8AqWn5XPMK6FSj8lcwwL8QAQPrTnpocd8e/fS9RPb3KD2QVWy7W0Ix Uiwb7wAXLWh+IRwVlqaQyjaBqv0nNfSXbW78HPK+vSltCUx3RGTBfz+VvOdW3zFP33dG fTAstxc0nl5iIHq+gcjrBz4dO16060tW2JPAh9x83xiUyiBBNpkLsOuXJXFxuKqdz3aG KOyXzUZNM3kB18AzE9c7UB5rc50kzhlmalw7n8aCk5DaMhKh3vacanUbk6kmtmZ94e3P KQisgbRhWwnfEV+7ovn5ctiZCEfXy1usvIocLu0bkAVUFPQaijx1FFaNWfl2sk9HiY0H 8QLQ== X-Gm-Message-State: AFeK/H3uvywnsXe1YlaVYELcoCAHPQKX+t4QmYSzH5wgzlNnitazNya52Rn2VvkQX2zjDw== X-Received: by 10.99.253.5 with SMTP id d5mr48040563pgh.47.1491701726217; Sat, 08 Apr 2017 18:35:26 -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:08 +0800 X-Original-Message-ID: <6083bff784d90ee208c7663c5aa34a1e8988d6e2.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:1619415 Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang --- drivers/media/rc/imon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 89823d2..3489010 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -2412,9 +2412,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf, mutex_lock(&ictx->lock); if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) { - init_timer(&ictx->ttimer); - ictx->ttimer.data = (unsigned long)ictx; - ictx->ttimer.function = imon_touch_display_timeout; + setup_timer(&ictx->ttimer, imon_touch_display_timeout, + (unsigned long)ictx); } ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf)); -- 2.9.3