hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: firewire-tascam: 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:15 +09:00 committed by Takashi Iwai
parent 15d472ecc5
commit 9628fc82f9
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
--tscm->substreams_counter; --tscm->substreams_counter;
snd_tscm_stream_stop_duplex(tscm); snd_tscm_stream_stop_duplex(tscm);
snd_tscm_stream_release_duplex(tscm);
mutex_unlock(&tscm->mutex); mutex_unlock(&tscm->mutex);

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

@ -380,14 +380,6 @@ int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate)
return 0; return 0;
} }
void snd_tscm_stream_release_duplex(struct snd_tscm *tscm)
{
if (tscm->substreams_counter == 0) {
fw_iso_resources_free(&tscm->tx_resources);
fw_iso_resources_free(&tscm->rx_resources);
}
}
int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)
{ {
unsigned int generation = tscm->rx_resources.generation; unsigned int generation = tscm->rx_resources.generation;
@ -455,8 +447,12 @@ error:
void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm) void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm)
{ {
if (tscm->substreams_counter == 0) if (tscm->substreams_counter == 0) {
finish_session(tscm); finish_session(tscm);
fw_iso_resources_free(&tscm->tx_resources);
fw_iso_resources_free(&tscm->rx_resources);
}
} }
void snd_tscm_stream_lock_changed(struct snd_tscm *tscm) void snd_tscm_stream_lock_changed(struct snd_tscm *tscm)

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

@ -148,7 +148,6 @@ int snd_tscm_stream_init_duplex(struct snd_tscm *tscm);
void snd_tscm_stream_update_duplex(struct snd_tscm *tscm); void snd_tscm_stream_update_duplex(struct snd_tscm *tscm);
void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm); void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm);
int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate); int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate);
void snd_tscm_stream_release_duplex(struct snd_tscm *tscm);
int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate); int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate);
void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm); void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm);