From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbbASJx1 (ORCPT ); Mon, 19 Jan 2015 04:53:27 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50655 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbbASJx0 (ORCPT ); Mon, 19 Jan 2015 04:53:26 -0500 Date: Mon, 19 Jan 2015 10:53:24 +0100 Message-ID: From: Takashi Iwai To: Jiri Slaby Cc: linux-kernel@vger.kernel.org, Roman Kollar , Jaroslav Kysela , alsa-devel@alsa-project.org Subject: Re: [PATCH 1/3] sound: dummy, use setup_timer and mod_timer In-Reply-To: <1421660576-8435-1-git-send-email-jslaby@suse.cz> References: <1421660576-8435-1-git-send-email-jslaby@suse.cz> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 19 Jan 2015 10:42:54 +0100, Jiri Slaby wrote: > > 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 Applied this one, thanks. Takashi > --- > 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 >