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

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

ALSA: firewire-digi00x: 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 eccd895c

sound/firewire/digi00x/digi00x-midi.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static int midi_close(struct snd_rawmidi_substream *substream) 
	mutex_lock(&dg00x->mutex);

	--dg00x->substreams_counter;

	snd_dg00x_stream_stop_duplex(dg00x);

	snd_dg00x_stream_release_duplex(dg00x);

	mutex_unlock(&dg00x->mutex);



	snd_dg00x_stream_lock_release(dg00x);

sound/firewire/digi00x/digi00x-pcm.c

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



	snd_dg00x_stream_stop_duplex(dg00x);

	snd_dg00x_stream_release_duplex(dg00x);



	mutex_unlock(&dg00x->mutex);

sound/firewire/digi00x/digi00x-stream.c

+5 −9
Original line number Diff line number Diff line
@@ -293,14 +293,6 @@ int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate) 
	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)

{

	unsigned int generation = dg00x->rx_resources.generation;
@@ -372,8 +364,12 @@ int snd_dg00x_stream_start_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);



		fw_iso_resources_free(&dg00x->tx_resources);

		fw_iso_resources_free(&dg00x->rx_resources);

	}

}



void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x)

sound/firewire/digi00x/digi00x.h

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