Commit 8e3bf7cd authored by Timo Wischer's avatar Timo Wischer Committed by Takashi Iwai

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: default avatarTimo Wischer <twischer@de.adit-jv.com>
Signed-off-by: default avatarAndrew Gabbasov <andrew_gabbasov@mentor.com>
Link: https://lore.kernel.org/r/20191120174955.6410-5-andrew_gabbasov@mentor.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 133f3759
...@@ -188,7 +188,7 @@ static inline unsigned int get_rate_shift(struct loopback_pcm *dpcm) ...@@ -188,7 +188,7 @@ static inline unsigned int get_rate_shift(struct loopback_pcm *dpcm)
} }
/* call in cable->lock */ /* 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 long tick;
unsigned int rate_shift = get_rate_shift(dpcm); unsigned int rate_shift = get_rate_shift(dpcm);
...@@ -209,7 +209,7 @@ static int loopback_timer_start(struct loopback_pcm *dpcm) ...@@ -209,7 +209,7 @@ static int loopback_timer_start(struct loopback_pcm *dpcm)
} }
/* call in cable->lock */ /* 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); del_timer(&dpcm->timer);
dpcm->timer.expires = 0; dpcm->timer.expires = 0;
...@@ -217,7 +217,7 @@ static inline int loopback_timer_stop(struct loopback_pcm *dpcm) ...@@ -217,7 +217,7 @@ static inline int loopback_timer_stop(struct loopback_pcm *dpcm)
return 0; 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); del_timer_sync(&dpcm->timer);
...@@ -502,7 +502,8 @@ static inline void bytepos_finish(struct loopback_pcm *dpcm, ...@@ -502,7 +502,8 @@ static inline void bytepos_finish(struct loopback_pcm *dpcm,
} }
/* call in cable->lock */ /* 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 = struct loopback_pcm *dpcm_play =
cable->streams[SNDRV_PCM_STREAM_PLAYBACK]; cable->streams[SNDRV_PCM_STREAM_PLAYBACK];
...@@ -555,14 +556,15 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable) ...@@ -555,14 +556,15 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
return running; 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); struct loopback_pcm *dpcm = from_timer(dpcm, t, timer);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dpcm->cable->lock, flags); spin_lock_irqsave(&dpcm->cable->lock, flags);
if (loopback_pos_update(dpcm->cable) & (1 << dpcm->substream->stream)) { if (loopback_jiffies_timer_pos_update(dpcm->cable) &
loopback_timer_start(dpcm); (1 << dpcm->substream->stream)) {
loopback_jiffies_timer_start(dpcm);
if (dpcm->period_update_pending) { if (dpcm->period_update_pending) {
dpcm->period_update_pending = 0; dpcm->period_update_pending = 0;
spin_unlock_irqrestore(&dpcm->cable->lock, flags); spin_unlock_irqrestore(&dpcm->cable->lock, flags);
...@@ -731,18 +733,18 @@ static void free_cable(struct snd_pcm_substream *substream) ...@@ -731,18 +733,18 @@ static void free_cable(struct snd_pcm_substream *substream)
static int loopback_jiffies_timer_open(struct loopback_pcm *dpcm) 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; return 0;
} }
static struct loopback_ops loopback_jiffies_timer_ops = { static struct loopback_ops loopback_jiffies_timer_ops = {
.open = loopback_jiffies_timer_open, .open = loopback_jiffies_timer_open,
.start = loopback_timer_start, .start = loopback_jiffies_timer_start,
.stop = loopback_timer_stop, .stop = loopback_jiffies_timer_stop,
.stop_sync = loopback_timer_stop_sync, .stop_sync = loopback_jiffies_timer_stop_sync,
.close_substream = loopback_timer_stop_sync, .close_substream = loopback_jiffies_timer_stop_sync,
.pos_update = loopback_pos_update, .pos_update = loopback_jiffies_timer_pos_update,
.dpcm_info = loopback_jiffies_timer_dpcm_info, .dpcm_info = loopback_jiffies_timer_dpcm_info,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment