xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: fireface: minor code refactoring to finish streaming session

Browse Source 
The operation to finish packet streaming corresponds to stopping
isochronous contexts.

This commit applies code refactoring to move codes to stop into
a helper function to finish the session.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto
2019-06-02 16:12:58 +09:00
committed by Takashi Iwai
parent b88f4d7c38
commit f55e2a8979
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sound/firewire/fireface/ff-stream.c
View File

@@ -33,6 +33,9 @@ int snd_ff_stream_get_multiplier_mode(enum cip_sfc sfc,
static inline void finish_session(struct snd_ff *ff) 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->finish_session(ff);
ff->spec->protocol->switch_fetching_mode(ff, false); 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; enum snd_ff_stream_mode mode;
int i; int i;
amdtp_stream_stop(&ff->tx_stream);
amdtp_stream_stop(&ff->rx_stream);
finish_session(ff); finish_session(ff);
fw_iso_resources_free(&ff->tx_resources); 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; return 0;
if (amdtp_streaming_error(&ff->tx_stream) || if (amdtp_streaming_error(&ff->tx_stream) ||
amdtp_streaming_error(&ff->rx_stream)) { amdtp_streaming_error(&ff->rx_stream))
amdtp_stream_stop(&ff->tx_stream);
amdtp_stream_stop(&ff->rx_stream);
finish_session(ff); finish_session(ff);
}
/* /*
* Regardless of current source of clock signal, drivers transfer some * 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; return 0;
error: error:
amdtp_stream_stop(&ff->tx_stream);
amdtp_stream_stop(&ff->rx_stream);
finish_session(ff); finish_session(ff);
return err; return err;
@@ -224,12 +217,8 @@ error:
void snd_ff_stream_stop_duplex(struct snd_ff *ff) void snd_ff_stream_stop_duplex(struct snd_ff *ff)
{ {
if (ff->substreams_counter > 0) if (ff->substreams_counter == 0)
return; finish_session(ff);
amdtp_stream_stop(&ff->tx_stream);
amdtp_stream_stop(&ff->rx_stream);
finish_session(ff);
} }
void snd_ff_stream_update_duplex(struct snd_ff *ff) void snd_ff_stream_update_duplex(struct snd_ff *ff)