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

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

ALSA: firewire-motu: 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 af26bacc

sound/firewire/motu/motu-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) 


	--motu->substreams_counter;

	snd_motu_stream_stop_duplex(motu);

	snd_motu_stream_release_duplex(motu);



	mutex_unlock(&motu->mutex);

sound/firewire/motu/motu-pcm.c

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



	snd_motu_stream_stop_duplex(motu);

	snd_motu_stream_release_duplex(motu);



	mutex_unlock(&motu->mutex);

sound/firewire/motu/motu-stream.c

+5 −9
Original line number Diff line number Diff line
@@ -200,14 +200,6 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate) 
	return 0;

}



void snd_motu_stream_release_duplex(struct snd_motu *motu)

{

	if (motu->substreams_counter == 0) {

		fw_iso_resources_free(&motu->tx_resources);

		fw_iso_resources_free(&motu->rx_resources);

	}

}



static int ensure_packet_formats(struct snd_motu *motu)

{

	__be32 reg;
@@ -301,8 +293,12 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu) 


void snd_motu_stream_stop_duplex(struct snd_motu *motu)

{

	if (motu->substreams_counter == 0)

	if (motu->substreams_counter == 0) {

		finish_session(motu);



		fw_iso_resources_free(&motu->tx_resources);

		fw_iso_resources_free(&motu->rx_resources);

	}

}



static int init_stream(struct snd_motu *motu, enum amdtp_stream_direction dir)

sound/firewire/motu/motu.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ int snd_motu_stream_init_duplex(struct snd_motu *motu); 
void snd_motu_stream_destroy_duplex(struct snd_motu *motu);

int snd_motu_stream_cache_packet_formats(struct snd_motu *motu);

int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate);

void snd_motu_stream_release_duplex(struct snd_motu *motu);

int snd_motu_stream_start_duplex(struct snd_motu *motu);

void snd_motu_stream_stop_duplex(struct snd_motu *motu);

int snd_motu_stream_lock_try(struct snd_motu *motu);