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

ALSA: dice: 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:19 +09:00 committed by Takashi Iwai
parent b9434540dd
commit 740680f22d
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ static int midi_close(struct snd_rawmidi_substream *substream)
--dice->substreams_counter; --dice->substreams_counter;
snd_dice_stream_stop_duplex(dice); snd_dice_stream_stop_duplex(dice);
snd_dice_stream_release_duplex(dice);
mutex_unlock(&dice->mutex); mutex_unlock(&dice->mutex);

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

@ -265,7 +265,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
--dice->substreams_counter; --dice->substreams_counter;
snd_dice_stream_stop_duplex(dice); snd_dice_stream_stop_duplex(dice);
snd_dice_stream_release_duplex(dice);
mutex_unlock(&dice->mutex); mutex_unlock(&dice->mutex);

8
sound/firewire/dice/dice-stream.c
View File

@ -336,12 +336,6 @@ error:
return err; return err;
} }
void snd_dice_stream_release_duplex(struct snd_dice *dice)
{
if (dice->substreams_counter == 0)
release_resources(dice);
}
static int start_streams(struct snd_dice *dice, enum amdtp_stream_direction dir, static int start_streams(struct snd_dice *dice, enum amdtp_stream_direction dir,
unsigned int rate, struct reg_params *params) unsigned int rate, struct reg_params *params)
{ {
@ -494,6 +488,8 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice)
if (dice->substreams_counter == 0) { if (dice->substreams_counter == 0) {
if (get_register_params(dice, &tx_params, &rx_params) >= 0) if (get_register_params(dice, &tx_params, &rx_params) >= 0)
finish_session(dice, &tx_params, &rx_params); finish_session(dice, &tx_params, &rx_params);
release_resources(dice);
} }
} }

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

@ -210,7 +210,6 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice);
int snd_dice_stream_init_duplex(struct snd_dice *dice); int snd_dice_stream_init_duplex(struct snd_dice *dice);
void snd_dice_stream_destroy_duplex(struct snd_dice *dice); void snd_dice_stream_destroy_duplex(struct snd_dice *dice);
int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate); int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate);
void snd_dice_stream_release_duplex(struct snd_dice *dice);
void snd_dice_stream_update_duplex(struct snd_dice *dice); void snd_dice_stream_update_duplex(struct snd_dice *dice);
int snd_dice_stream_detect_current_formats(struct snd_dice *dice); int snd_dice_stream_detect_current_formats(struct snd_dice *dice);