ALSA: fireface: minor code refactoring to finish streaming session (f55e2a89) · Commits · 戴 / test

sound/firewire/fireface/ff-stream.c

+6 −17

Original line number	Diff line number	Diff line
		@@ -33,6 +33,9 @@ int snd_ff_stream_get_multiplier_mode(enum cip_sfc sfc,

		static inline void finish_session(struct snd_ff *ff)
		{
		amdtp_stream_stop(&ff->tx_stream);
		amdtp_stream_stop(&ff->rx_stream);

		ff->spec->protocol->finish_session(ff);
		ff->spec->protocol->switch_fetching_mode(ff, false);
		}
		@@ -112,9 +115,6 @@ int snd_ff_stream_reserve_duplex(struct snd_ff *ff, unsigned int rate)
		enum snd_ff_stream_mode mode;
		int i;

		amdtp_stream_stop(&ff->tx_stream);
		amdtp_stream_stop(&ff->rx_stream);

		finish_session(ff);

		fw_iso_resources_free(&ff->tx_resources);
		@@ -165,12 +165,8 @@ int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate)
		return 0;

		if (amdtp_streaming_error(&ff->tx_stream) \|\|
		amdtp_streaming_error(&ff->rx_stream)) {
		amdtp_stream_stop(&ff->tx_stream);
		amdtp_stream_stop(&ff->rx_stream);

		amdtp_streaming_error(&ff->rx_stream))
		finish_session(ff);
		}

		/*
		* Regardless of current source of clock signal, drivers transfer some
		@@ -214,9 +210,6 @@ int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate)

		return 0;
		error:
		amdtp_stream_stop(&ff->tx_stream);
		amdtp_stream_stop(&ff->rx_stream);

		finish_session(ff);

		return err;
		@@ -224,11 +217,7 @@ error:

		void snd_ff_stream_stop_duplex(struct snd_ff *ff)
		{
		if (ff->substreams_counter > 0)
		return;

		amdtp_stream_stop(&ff->tx_stream);
		amdtp_stream_stop(&ff->rx_stream);
		if (ff->substreams_counter == 0)
		finish_session(ff);
		}