]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ALSA: seq: Avoid open-code for getting timer resolution
authorTakashi Iwai <tiwai@suse.de>
Thu, 17 May 2018 08:43:16 +0000 (10:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 18 May 2018 06:49:13 +0000 (08:49 +0200)
Instead of open-coding for getting the timer resolution, use the
standard snd_timer_resolution() helper.

The original code falls back to the callback function when the
resolution is zero, but it must be always so when the callback
function is defined.  So this should be no functional change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/seq/seq_timer.c

index 23167578231f3c002a79dd034b0e3d8c0b83eeea..f587d0e2747606e116a26e71722a0b705190bcfd 100644 (file)
@@ -371,9 +371,7 @@ static int initialize_timer(struct snd_seq_timer *tmr)
 
        tmr->ticks = 1;
        if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
-               unsigned long r = t->hw.resolution;
-               if (! r && t->hw.c_resolution)
-                       r = t->hw.c_resolution(t);
+               unsigned long r = snd_timer_resolution(tmr->timeri);
                if (r) {
                        tmr->ticks = (unsigned int)(1000000000uL / (r * freq));
                        if (! tmr->ticks)