From: <twischer@de.adit-jv.com> To: <patch@alsa-project.org>, <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com> Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, Timo Wischer <twischer@de.adit-jv.com> Subject: [PATCH 03/10] ALSA: aloop: loopback_timer_stop: Support return of error code Date: Mon, 25 Mar 2019 17:00:37 +0100 [thread overview] Message-ID: <1553529644-5654-4-git-send-email-twischer@de.adit-jv.com> (raw) In-Reply-To: <1553529644-5654-1-git-send-email-twischer@de.adit-jv.com> From: Timo Wischer <twischer@de.adit-jv.com> This is required for additional timer implementations which could detect errors and want to throw them. Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> --- sound/drivers/aloop.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index f0c7b5b..11e8ed6 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -190,15 +190,19 @@ static int loopback_timer_start(struct loopback_pcm *dpcm) } /* call in cable->lock */ -static inline void loopback_timer_stop(struct loopback_pcm *dpcm) +static inline int loopback_timer_stop(struct loopback_pcm *dpcm) { del_timer(&dpcm->timer); dpcm->timer.expires = 0; + + return 0; } -static inline void loopback_timer_stop_sync(struct loopback_pcm *dpcm) +static inline int loopback_timer_stop_sync(struct loopback_pcm *dpcm) { del_timer_sync(&dpcm->timer); + + return 0; } #define CABLE_VALID_PLAYBACK (1 << SNDRV_PCM_STREAM_PLAYBACK) @@ -289,7 +293,7 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) spin_lock(&cable->lock); cable->running &= ~stream; cable->pause &= ~stream; - loopback_timer_stop(dpcm); + err = loopback_timer_stop(dpcm); spin_unlock(&cable->lock); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) loopback_active_notify(dpcm); @@ -298,7 +302,7 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_SUSPEND: spin_lock(&cable->lock); cable->pause |= stream; - loopback_timer_stop(dpcm); + err = loopback_timer_stop(dpcm); spin_unlock(&cable->lock); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) loopback_active_notify(dpcm); @@ -337,9 +341,11 @@ static int loopback_prepare(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct loopback_pcm *dpcm = runtime->private_data; struct loopback_cable *cable = dpcm->cable; - int bps, salign; + int err, bps, salign; - loopback_timer_stop_sync(dpcm); + err = loopback_timer_stop_sync(dpcm); + if (err < 0) + return err; salign = (snd_pcm_format_width(runtime->format) * runtime->channels) / 8; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: <twischer@de.adit-jv.com> To: patch@alsa-project.org, broonie@kernel.org, perex@perex.cz, tiwai@suse.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Timo Wischer <twischer@de.adit-jv.com> Subject: [PATCH 03/10] ALSA: aloop: loopback_timer_stop: Support return of error code Date: Mon, 25 Mar 2019 17:00:37 +0100 [thread overview] Message-ID: <1553529644-5654-4-git-send-email-twischer@de.adit-jv.com> (raw) In-Reply-To: <1553529644-5654-1-git-send-email-twischer@de.adit-jv.com> From: Timo Wischer <twischer@de.adit-jv.com> This is required for additional timer implementations which could detect errors and want to throw them. Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> --- sound/drivers/aloop.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index f0c7b5b..11e8ed6 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -190,15 +190,19 @@ static int loopback_timer_start(struct loopback_pcm *dpcm) } /* call in cable->lock */ -static inline void loopback_timer_stop(struct loopback_pcm *dpcm) +static inline int loopback_timer_stop(struct loopback_pcm *dpcm) { del_timer(&dpcm->timer); dpcm->timer.expires = 0; + + return 0; } -static inline void loopback_timer_stop_sync(struct loopback_pcm *dpcm) +static inline int loopback_timer_stop_sync(struct loopback_pcm *dpcm) { del_timer_sync(&dpcm->timer); + + return 0; } #define CABLE_VALID_PLAYBACK (1 << SNDRV_PCM_STREAM_PLAYBACK) @@ -289,7 +293,7 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) spin_lock(&cable->lock); cable->running &= ~stream; cable->pause &= ~stream; - loopback_timer_stop(dpcm); + err = loopback_timer_stop(dpcm); spin_unlock(&cable->lock); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) loopback_active_notify(dpcm); @@ -298,7 +302,7 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_SUSPEND: spin_lock(&cable->lock); cable->pause |= stream; - loopback_timer_stop(dpcm); + err = loopback_timer_stop(dpcm); spin_unlock(&cable->lock); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) loopback_active_notify(dpcm); @@ -337,9 +341,11 @@ static int loopback_prepare(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct loopback_pcm *dpcm = runtime->private_data; struct loopback_cable *cable = dpcm->cable; - int bps, salign; + int err, bps, salign; - loopback_timer_stop_sync(dpcm); + err = loopback_timer_stop_sync(dpcm); + if (err < 0) + return err; salign = (snd_pcm_format_width(runtime->format) * runtime->channels) / 8; -- 2.7.4
next prev parent reply other threads:[~2019-03-25 16:01 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-25 16:00 [PATCH 00/10] ALSA: aloop: Support selection of snd_timer twischer 2019-03-25 16:00 ` twischer 2019-03-25 16:00 ` [PATCH 01/10] ALSA: aloop: Describe units of variables twischer 2019-03-25 16:00 ` twischer 2019-03-25 16:00 ` [PATCH 02/10] ALSA: aloop: loopback_timer_start: Support return of error code twischer 2019-03-25 16:00 ` twischer 2019-03-25 16:00 ` twischer [this message] 2019-03-25 16:00 ` [PATCH 03/10] ALSA: aloop: loopback_timer_stop: " twischer 2019-03-25 16:00 ` [PATCH 04/10] ALSA: aloop: Use always spin_lock_irqsave() for cable->lock twischer 2019-03-25 16:00 ` twischer 2019-03-25 16:07 ` Takashi Iwai 2019-03-25 16:07 ` Takashi Iwai 2019-03-25 16:40 ` Timo Wischer 2019-03-25 16:58 ` Takashi Iwai 2019-03-25 16:58 ` Takashi Iwai 2019-03-26 8:12 ` Timo Wischer 2019-03-26 8:12 ` Timo Wischer 2019-03-26 7:49 ` [PATCH 05/10] ALSA: aloop: Use callback functions for timer specific implementations twischer 2019-03-26 7:49 ` twischer 2019-03-26 7:49 ` [PATCH 06/10] ALSA: aloop: Rename all jiffies timer specific functions twischer 2019-03-26 7:49 ` twischer 2019-03-26 7:49 ` [PATCH 07/10] ALSA: aloop: Move CABLE_VALID_BOTH to the top of file twischer 2019-03-26 7:49 ` twischer 2019-03-26 7:49 ` [PATCH 08/10] ALSA: aloop: Support selection of snd_timer instead of jiffies twischer 2019-03-26 7:49 ` twischer 2019-03-26 7:49 ` [PATCH 09/10] ALSA: pcm: Add snd_pcm_ops for snd_pcm_link() twischer 2019-03-26 7:49 ` twischer 2019-03-26 8:35 ` Takashi Iwai 2019-03-26 8:35 ` Takashi Iwai 2019-03-26 11:25 ` Timo Wischer 2019-03-26 14:23 ` Takashi Iwai 2019-03-26 14:23 ` Takashi Iwai 2019-03-26 15:16 ` Timo Wischer 2019-03-26 15:16 ` Timo Wischer 2019-03-26 16:00 ` Takashi Iwai 2019-03-26 16:00 ` Takashi Iwai 2019-03-27 8:34 ` Timo Wischer 2019-03-27 8:34 ` Timo Wischer 2019-03-27 9:11 ` Takashi Iwai 2019-03-27 9:11 ` Takashi Iwai 2019-03-27 9:26 ` Timo Wischer 2019-03-27 9:26 ` Timo Wischer 2019-03-27 9:38 ` Takashi Iwai 2019-03-27 9:38 ` Takashi Iwai 2019-04-04 10:18 ` Timo Wischer 2019-04-04 10:18 ` Timo Wischer 2019-04-05 15:21 ` Takashi Iwai 2019-04-05 15:21 ` Takashi Iwai 2019-03-26 7:52 ` [PATCH 10/10] ALSA: aloop: Use timer of linked card if chosen twischer 2019-03-26 7:52 ` twischer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1553529644-5654-4-git-send-email-twischer@de.adit-jv.com \ --to=twischer@de.adit-jv.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patch@alsa-project.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.