ALSA: aloop: Rename all jiffies timer specific functions

This commit does not change the behaviour. It only separates the jiffies
timer specific implementation from the generic part.

Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Link: https://lore.kernel.org/r/20191120174955.6410-5-andrew_gabbasov@mentor.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 3bfd7c3..2f208aa 100644 (file)
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -188,7 +188,7 @@ static inline unsigned int get_rate_shift(struct loopback_pcm *dpcm)
 }
 
 /* call in cable->lock */
-static int loopback_timer_start(struct loopback_pcm *dpcm)
+static int loopback_jiffies_timer_start(struct loopback_pcm *dpcm)
 {
        unsigned long tick;
        unsigned int rate_shift = get_rate_shift(dpcm);
@@ -209,7 +209,7 @@ static int loopback_timer_start(struct loopback_pcm *dpcm)
 }
 
 /* call in cable->lock */
-static inline int loopback_timer_stop(struct loopback_pcm *dpcm)
+static inline int loopback_jiffies_timer_stop(struct loopback_pcm *dpcm)
 {
        del_timer(&dpcm->timer);
        dpcm->timer.expires = 0;
@@ -217,7 +217,7 @@ static inline int loopback_timer_stop(struct loopback_pcm *dpcm)
        return 0;
 }
 
-static inline int loopback_timer_stop_sync(struct loopback_pcm *dpcm)
+static inline int loopback_jiffies_timer_stop_sync(struct loopback_pcm *dpcm)
 {
        del_timer_sync(&dpcm->timer);
 
@@ -502,7 +502,8 @@ static inline void bytepos_finish(struct loopback_pcm *dpcm,
 }
 
 /* call in cable->lock */
-static unsigned int loopback_pos_update(struct loopback_cable *cable)
+static unsigned int loopback_jiffies_timer_pos_update
+               (struct loopback_cable *cable)
 {
        struct loopback_pcm *dpcm_play =
                        cable->streams[SNDRV_PCM_STREAM_PLAYBACK];
@@ -555,14 +556,15 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
        return running;
 }
 
-static void loopback_timer_function(struct timer_list *t)
+static void loopback_jiffies_timer_function(struct timer_list *t)
 {
        struct loopback_pcm *dpcm = from_timer(dpcm, t, timer);
        unsigned long flags;
 
        spin_lock_irqsave(&dpcm->cable->lock, flags);
-       if (loopback_pos_update(dpcm->cable) & (1 << dpcm->substream->stream)) {
-               loopback_timer_start(dpcm);
+       if (loopback_jiffies_timer_pos_update(dpcm->cable) &
+                       (1 << dpcm->substream->stream)) {
+               loopback_jiffies_timer_start(dpcm);
                if (dpcm->period_update_pending) {
                        dpcm->period_update_pending = 0;
                        spin_unlock_irqrestore(&dpcm->cable->lock, flags);
@@ -731,18 +733,18 @@ static void free_cable(struct snd_pcm_substream *substream)
 
 static int loopback_jiffies_timer_open(struct loopback_pcm *dpcm)
 {
-       timer_setup(&dpcm->timer, loopback_timer_function, 0);
+       timer_setup(&dpcm->timer, loopback_jiffies_timer_function, 0);
 
        return 0;
 }
 
 static struct loopback_ops loopback_jiffies_timer_ops = {
        .open = loopback_jiffies_timer_open,
-       .start = loopback_timer_start,
-       .stop = loopback_timer_stop,
-       .stop_sync = loopback_timer_stop_sync,
-       .close_substream = loopback_timer_stop_sync,
-       .pos_update = loopback_pos_update,
+       .start = loopback_jiffies_timer_start,
+       .stop = loopback_jiffies_timer_stop,
+       .stop_sync = loopback_jiffies_timer_stop_sync,
+       .close_substream = loopback_jiffies_timer_stop_sync,
+       .pos_update = loopback_jiffies_timer_pos_update,
        .dpcm_info = loopback_jiffies_timer_dpcm_info,
 };