summaryrefslogtreecommitdiff
path: root/sound/firewire/motu
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-06-18 16:26:17 +0300
committerTakashi Iwai <tiwai@suse.de>2019-06-21 12:47:02 +0300
commiteccd895c998549ebb4a80f0ebee13b6a179bd40c (patch)
tree914d5573deb2c38e01893405cdd1c7b4da736de4 /sound/firewire/motu
parentaf26bacc1c5ace50645b29aea148c6143753edd4 (diff)
downloadlinux-eccd895c998549ebb4a80f0ebee13b6a179bd40c.tar.xz
ALSA: firewire-motu: unify stop and release method for duplex streams
>From callbacks for pcm and rawmidi interfaces, the functions to stop and release duplex streams are called at the same time. This commit merges the two functions. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/motu')
-rw-r--r--sound/firewire/motu/motu-midi.c1
-rw-r--r--sound/firewire/motu/motu-pcm.c1
-rw-r--r--sound/firewire/motu/motu-stream.c14
-rw-r--r--sound/firewire/motu/motu.h1
4 files changed, 5 insertions, 12 deletions
diff --git a/sound/firewire/motu/motu-midi.c b/sound/firewire/motu/motu-midi.c
index a463730c72bc..4520c0060b83 100644
--- a/sound/firewire/motu/motu-midi.c
+++ b/sound/firewire/motu/motu-midi.c
@@ -40,7 +40,6 @@ static int midi_close(struct snd_rawmidi_substream *substream)
--motu->substreams_counter;
snd_motu_stream_stop_duplex(motu);
- snd_motu_stream_release_duplex(motu);
mutex_unlock(&motu->mutex);
diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c
index b9852c911b98..60c691d18952 100644
--- a/sound/firewire/motu/motu-pcm.c
+++ b/sound/firewire/motu/motu-pcm.c
@@ -224,7 +224,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
--motu->substreams_counter;
snd_motu_stream_stop_duplex(motu);
- snd_motu_stream_release_duplex(motu);
mutex_unlock(&motu->mutex);
diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 82891583b736..8aab5db71c0f 100644
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -200,14 +200,6 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate)
return 0;
}
-void snd_motu_stream_release_duplex(struct snd_motu *motu)
-{
- if (motu->substreams_counter == 0) {
- fw_iso_resources_free(&motu->tx_resources);
- fw_iso_resources_free(&motu->rx_resources);
- }
-}
-
static int ensure_packet_formats(struct snd_motu *motu)
{
__be32 reg;
@@ -301,8 +293,12 @@ stop_streams:
void snd_motu_stream_stop_duplex(struct snd_motu *motu)
{
- if (motu->substreams_counter == 0)
+ if (motu->substreams_counter == 0) {
finish_session(motu);
+
+ fw_iso_resources_free(&motu->tx_resources);
+ fw_iso_resources_free(&motu->rx_resources);
+ }
}
static int init_stream(struct snd_motu *motu, enum amdtp_stream_direction dir)
diff --git a/sound/firewire/motu/motu.h b/sound/firewire/motu/motu.h
index 32cd42873fd0..a4ac320f2c9e 100644
--- a/sound/firewire/motu/motu.h
+++ b/sound/firewire/motu/motu.h
@@ -154,7 +154,6 @@ int snd_motu_stream_init_duplex(struct snd_motu *motu);
void snd_motu_stream_destroy_duplex(struct snd_motu *motu);
int snd_motu_stream_cache_packet_formats(struct snd_motu *motu);
int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate);
-void snd_motu_stream_release_duplex(struct snd_motu *motu);
int snd_motu_stream_start_duplex(struct snd_motu *motu);
void snd_motu_stream_stop_duplex(struct snd_motu *motu);
int snd_motu_stream_lock_try(struct snd_motu *motu);