From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752107AbbASJnA (ORCPT ); Mon, 19 Jan 2015 04:43:00 -0500 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:39214 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751809AbbASJm6 (ORCPT ); Mon, 19 Jan 2015 04:42:58 -0500 From: Jiri Slaby To: tiwai@suse.de Cc: linux-kernel@vger.kernel.org, Roman Kollar , Jiri Slaby , Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH 1/3] sound: dummy, use setup_timer and mod_timer Date: Mon, 19 Jan 2015 10:42:54 +0100 Message-Id: <1421660576-8435-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.2.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roman Kollar Use setup_timer and mod_timer instead of structure assignments as it is the preferred way to setup and set the timer. Signed-off-by: Roman Kollar Signed-off-by: Jiri Slaby Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: alsa-devel@alsa-project.org --- sound/drivers/dummy.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 5d0dfb787cec..d11baaf0f0b4 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -245,9 +245,8 @@ struct dummy_systimer_pcm { static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm) { - dpcm->timer.expires = jiffies + - (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate; - add_timer(&dpcm->timer); + mod_timer(&dpcm->timer, jiffies + + (dpcm->frac_period_rest + dpcm->rate - 1) / dpcm->rate); } static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm) @@ -340,9 +339,8 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream) if (!dpcm) return -ENOMEM; substream->runtime->private_data = dpcm; - init_timer(&dpcm->timer); - dpcm->timer.data = (unsigned long) dpcm; - dpcm->timer.function = dummy_systimer_callback; + setup_timer(&dpcm->timer, dummy_systimer_callback, + (unsigned long) dpcm); spin_lock_init(&dpcm->lock); dpcm->substream = substream; return 0; -- 2.2.1