Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932404Ab3ENOvF (ORCPT ); Tue, 14 May 2013 10:51:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46228 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932266Ab3ENOvC (ORCPT ); Tue, 14 May 2013 10:51:02 -0400 Date: Tue, 14 May 2013 16:50:56 +0200 Message-ID: From: Takashi Iwai To: Imre Deak Cc: linux-kernel@vger.kernel.org, Andrew Morton , Daniel Vetter , Clemens Ladisch , Jaroslav Kysela , alsa-devel@alsa-project.org Subject: Re: [PATCH v2 8/8] sound/oxygen_io: take msecs_to_jiffies_timeout into use In-Reply-To: <1368542918-8861-9-git-send-email-imre.deak@intel.com> References: <1368542918-8861-1-git-send-email-imre.deak@intel.com> <1368542918-8861-9-git-send-email-imre.deak@intel.com> 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.2 (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 Content-Length: 1205 Lines: 37 At Tue, 14 May 2013 17:48:38 +0300, Imre Deak wrote: > > Use msecs_to_jiffies_timeout instead of open-coding the same. > > Signed-off-by: Imre Deak Acked-by: Takashi Iwai Takashi > --- > sound/pci/oxygen/oxygen_io.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c > index 521eae4..51bfcd0 100644 > --- a/sound/pci/oxygen/oxygen_io.c > +++ b/sound/pci/oxygen/oxygen_io.c > @@ -108,7 +108,7 @@ static int oxygen_ac97_wait(struct oxygen *chip, unsigned int mask) > wait_event_timeout(chip->ac97_waitqueue, > ({ status |= oxygen_read8(chip, OXYGEN_AC97_INTERRUPT_STATUS); > status & mask; }), > - msecs_to_jiffies(1) + 1); > + msecs_to_jiffies_timeout(1)); > /* > * Check even after a timeout because this function should not require > * the AC'97 interrupt to be enabled. > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/