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

Commit 9628fc82 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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

sound/firewire/tascam/tascam-pcm.c

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



	snd_tscm_stream_stop_duplex(tscm);

	snd_tscm_stream_release_duplex(tscm);



	mutex_unlock(&tscm->mutex);

sound/firewire/tascam/tascam-stream.c

+5 −9
Original line number Diff line number Diff line
@@ -380,14 +380,6 @@ int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate) 
	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)

{

	unsigned int generation = tscm->rx_resources.generation;
@@ -455,8 +447,12 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) 


void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm)

{

	if (tscm->substreams_counter == 0)

	if (tscm->substreams_counter == 0) {

		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)

sound/firewire/tascam/tascam.h

+0 −1
Original line number Diff line number Diff line
@@ -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_destroy_duplex(struct snd_tscm *tscm);

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

void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm);