UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Sakamoto 2019-06-18 22:26:17 +09:00 committed by Takashi Iwai
parent af26bacc1c
commit eccd895c99
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/firewire/motu/motu-midi.c
View File

@ -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);

1
sound/firewire/motu/motu-pcm.c
View File

@ -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);

14
sound/firewire/motu/motu-stream.c
View File

@ -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)

1
sound/firewire/motu/motu.h
View File

@ -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);