[alsa-devel] [PATCH v2 8/8] sound/oxygen_io: take msecs_to_jiffies_timeout into use
Use msecs_to_jiffies_timeout instead of open-coding the same.
Signed-off-by: Imre Deak imre.deak@intel.com --- 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.
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 imre.deak@intel.com
Acked-by: Takashi Iwai tiwai@suse.de
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
participants (2)
-
Imre Deak -
Takashi Iwai