OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: firewire-motu: rename helper functions to begin/finish streaming session 

Like the other drivers in ALSA firewire stack, this commit renames
functions to begin/finish packet streaming.

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-17 17:15:05 +09:00 committed by Takashi Iwai
parent fc49769af4
commit b66ab1428e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/firewire/motu/motu-stream.c
View File

@ -60,7 +60,7 @@ static int keep_resources(struct snd_motu *motu, unsigned int rate,
fw_parent_device(motu->unit)->max_speed); fw_parent_device(motu->unit)->max_speed);
} }
static int start_both_streams(struct snd_motu *motu, unsigned int rate) static int begin_session(struct snd_motu *motu, unsigned int rate)
{ {
__be32 reg; __be32 reg;
u32 data; u32 data;
@ -91,7 +91,7 @@ static int start_both_streams(struct snd_motu *motu, unsigned int rate)
sizeof(reg)); sizeof(reg));
} }
static void stop_both_streams(struct snd_motu *motu) static void finish_session(struct snd_motu *motu)
{ {
__be32 reg; __be32 reg;
u32 data; u32 data;
@ -235,7 +235,7 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
amdtp_streaming_error(&motu->tx_stream)) { amdtp_streaming_error(&motu->tx_stream)) {
amdtp_stream_stop(&motu->rx_stream); amdtp_stream_stop(&motu->rx_stream);
amdtp_stream_stop(&motu->tx_stream); amdtp_stream_stop(&motu->tx_stream);
stop_both_streams(motu); finish_session(motu);
} }
if (!amdtp_stream_running(&motu->rx_stream)) { if (!amdtp_stream_running(&motu->rx_stream)) {
@ -250,7 +250,7 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
if (err < 0) if (err < 0)
return err; return err;
err = start_both_streams(motu, rate); err = begin_session(motu, rate);
if (err < 0) { if (err < 0) {
dev_err(&motu->unit->device, dev_err(&motu->unit->device,
"fail to start isochronous comm: %d\n", err); "fail to start isochronous comm: %d\n", err);
@ -285,7 +285,7 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
return 0; return 0;
stop_streams: stop_streams:
stop_both_streams(motu); finish_session(motu);
return err; return err;
} }