Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 740680f2 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b9434540

sound/firewire/dice/dice-midi.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ static int midi_close(struct snd_rawmidi_substream *substream) 


	--dice->substreams_counter;

	snd_dice_stream_stop_duplex(dice);

	snd_dice_stream_release_duplex(dice);



	mutex_unlock(&dice->mutex);

sound/firewire/dice/dice-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) 
		--dice->substreams_counter;



	snd_dice_stream_stop_duplex(dice);

	snd_dice_stream_release_duplex(dice);



	mutex_unlock(&dice->mutex);

sound/firewire/dice/dice-stream.c

+2 −6
Original line number Diff line number Diff line
@@ -336,12 +336,6 @@ int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate) 
	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,

			 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 (get_register_params(dice, &tx_params, &rx_params) >= 0)

			finish_session(dice, &tx_params, &rx_params);



		release_resources(dice);

	}

}

sound/firewire/dice/dice.h

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ void snd_dice_stream_stop_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);

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

int snd_dice_stream_detect_current_formats(struct snd_dice *dice);