From patchwork Tue Feb 3 07:38:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 5769291 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2AC679F302 for ; Tue, 3 Feb 2015 15:15:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC07920253 for ; Tue, 3 Feb 2015 15:15:21 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id C3D73200E3 for ; Tue, 3 Feb 2015 15:15:20 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 038C52615C0; Tue, 3 Feb 2015 16:15:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 4B62D26153A; Tue, 3 Feb 2015 16:14:09 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 28DB32608D4; Tue, 3 Feb 2015 08:43:12 +0100 (CET) Received: from www.osadl.org (www.osadl.org [62.245.132.105]) by alsa0.perex.cz (Postfix) with ESMTP id 6A34B260836 for ; Tue, 3 Feb 2015 08:43:06 +0100 (CET) Received: from debian.hofrr.at (92-243-35-153.adsl.nanet.at [92.243.35.153] (may be forged)) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id t137h1NH000425; Tue, 3 Feb 2015 08:43:01 +0100 From: Nicholas Mc Guire To: Jaroslav Kysela Date: Tue, 3 Feb 2015 02:38:56 -0500 Message-Id: <1422949136-9349-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 X-Mailman-Approved-At: Tue, 03 Feb 2015 16:14:08 +0100 Cc: alsa-devel@alsa-project.org, Chris Rorvick , Takashi Iwai , Greg Kroah-Hartman , Nicholas Mc Guire , linux-kernel@vger.kernel.org, Stefan Hajnoczi Subject: [alsa-devel] [PATCH 2/2] ALSA: line6: fixup of line6_start_timer argument type X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP line6_start_timer passes an unsigned int as argument to be used in mod_timer which is then used by mod_timer as unsigned long, this just fixes up the argument type. This change helps make static code checkers happy. Signed-off-by: Nicholas Mc Guire --- The change of argument type was checked against all call-sites - in all cases it is passing in a constant (either VARIAX_STARTUP_DELAY1 or POD_STARTUP_DELAY) which should be fine with the argument type change. Patch was compile tested for x86_64_defconfig + CONFIG_SOUND=y, CONFIG_SND_USB_POD=m (implies CONFIG_SND_USB_LINE6=y) Patch is against 3.0.19-rc6 (localversion = -next-20150202) sound/usb/line6/driver.c | 2 +- sound/usb/line6/driver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 3cf12cc..e2a2603 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -162,7 +162,7 @@ static int line6_send_raw_message_async_part(struct message *msg, /* Setup and start timer. */ -void line6_start_timer(struct timer_list *timer, unsigned int msecs, +void line6_start_timer(struct timer_list *timer, unsigned long msecs, void (*function)(unsigned long), unsigned long data) { setup_timer(timer, function, data); diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index fa877a3..2276b78 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -159,7 +159,7 @@ extern int line6_send_sysex_message(struct usb_line6 *line6, const char *buffer, int size); extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); -extern void line6_start_timer(struct timer_list *timer, unsigned int msecs, +extern void line6_start_timer(struct timer_list *timer, unsigned long msecs, void (*function)(unsigned long), unsigned long data); extern int line6_version_request_async(struct usb_line6 *line6);