leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: firewire-digi00x: unify stop and release method for duplex streams

Browse Source 
>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:18 +09:00 committed by Takashi Iwai
parent eccd895c99
commit b9434540dd
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/digi00x/digi00x-midi.c
View File

@ -37,7 +37,6 @@ static int midi_close(struct snd_rawmidi_substream *substream)
mutex_lock(&dg00x->mutex); mutex_lock(&dg00x->mutex);
--dg00x->substreams_counter; --dg00x->substreams_counter;
snd_dg00x_stream_stop_duplex(dg00x); snd_dg00x_stream_stop_duplex(dg00x);
snd_dg00x_stream_release_duplex(dg00x);
mutex_unlock(&dg00x->mutex); mutex_unlock(&dg00x->mutex);
snd_dg00x_stream_lock_release(dg00x); snd_dg00x_stream_lock_release(dg00x);

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

@ -189,7 +189,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
--dg00x->substreams_counter; --dg00x->substreams_counter;
snd_dg00x_stream_stop_duplex(dg00x); snd_dg00x_stream_stop_duplex(dg00x);
snd_dg00x_stream_release_duplex(dg00x);
mutex_unlock(&dg00x->mutex); mutex_unlock(&dg00x->mutex);

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

@ -293,14 +293,6 @@ int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate)
return 0; return 0;
} }
void snd_dg00x_stream_release_duplex(struct snd_dg00x *dg00x)
{
if (dg00x->substreams_counter == 0) {
fw_iso_resources_free(&dg00x->tx_resources);
fw_iso_resources_free(&dg00x->rx_resources);
}
}
int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x) int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)
{ {
unsigned int generation = dg00x->rx_resources.generation; unsigned int generation = dg00x->rx_resources.generation;
@ -372,8 +364,12 @@ error:
void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x) void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x)
{ {
if (dg00x->substreams_counter == 0) if (dg00x->substreams_counter == 0) {
finish_session(dg00x); finish_session(dg00x);
fw_iso_resources_free(&dg00x->tx_resources);
fw_iso_resources_free(&dg00x->rx_resources);
}
} }
void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x) void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x)

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

@ -143,7 +143,6 @@ int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x);
int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate); int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate);
int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x); int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x);
void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x); void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x);
void snd_dg00x_stream_release_duplex(struct snd_dg00x *dg00x);
void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x); void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x);
void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x); void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x);