diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-06-18 22:26:16 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-21 11:47:00 +0200 |
| commit | af26bacc1c5ace50645b29aea148c6143753edd4 (patch) | |
| tree | b74bf9eaf4e1a3414b065206fe8470f21ac2f1e6 /sound/firewire/fireface | |
| parent | 9628fc82f9feedfcb6b9756efb2966c00b3811ef (diff) | |
| download | linux-af26bacc1c5ace50645b29aea148c6143753edd4.tar.gz linux-af26bacc1c5ace50645b29aea148c6143753edd4.tar.bz2 linux-af26bacc1c5ace50645b29aea148c6143753edd4.zip | |
ALSA: fireface: 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/fireface')
| -rw-r--r-- | sound/firewire/fireface/ff-pcm.c | 1 | ||||
| -rw-r--r-- | sound/firewire/fireface/ff-stream.c | 14 | ||||
| -rw-r--r-- | sound/firewire/fireface/ff.h | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c index 938985c2d4a8..75228e769687 100644 --- a/sound/firewire/fireface/ff-pcm.c +++ b/sound/firewire/fireface/ff-pcm.c @@ -233,7 +233,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) --ff->substreams_counter; snd_ff_stream_stop_duplex(ff); - snd_ff_stream_release_duplex(ff); mutex_unlock(&ff->mutex); diff --git a/sound/firewire/fireface/ff-stream.c b/sound/firewire/fireface/ff-stream.c index 884705ecf940..049920a6d43e 100644 --- a/sound/firewire/fireface/ff-stream.c +++ b/sound/firewire/fireface/ff-stream.c @@ -149,14 +149,6 @@ int snd_ff_stream_reserve_duplex(struct snd_ff *ff, unsigned int rate) return 0; } -void snd_ff_stream_release_duplex(struct snd_ff *ff) -{ - if (ff->substreams_counter == 0) { - fw_iso_resources_free(&ff->tx_resources); - fw_iso_resources_free(&ff->rx_resources); - } -} - int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate) { int err; @@ -217,8 +209,12 @@ error: void snd_ff_stream_stop_duplex(struct snd_ff *ff) { - if (ff->substreams_counter == 0) + if (ff->substreams_counter == 0) { finish_session(ff); + + fw_iso_resources_free(&ff->tx_resources); + fw_iso_resources_free(&ff->rx_resources); + } } void snd_ff_stream_update_duplex(struct snd_ff *ff) diff --git a/sound/firewire/fireface/ff.h b/sound/firewire/fireface/ff.h index fe5739ee1c88..9b52c368f6de 100644 --- a/sound/firewire/fireface/ff.h +++ b/sound/firewire/fireface/ff.h @@ -139,7 +139,6 @@ int snd_ff_stream_get_multiplier_mode(enum cip_sfc sfc, int snd_ff_stream_init_duplex(struct snd_ff *ff); void snd_ff_stream_destroy_duplex(struct snd_ff *ff); int snd_ff_stream_reserve_duplex(struct snd_ff *ff, unsigned int rate); -void snd_ff_stream_release_duplex(struct snd_ff *ff); int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate); void snd_ff_stream_stop_duplex(struct snd_ff *ff); void snd_ff_stream_update_duplex(struct snd_ff *ff); |