aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-06-12 17:44:06 +0900
committerTakashi Iwai <tiwai@suse.de>2019-06-12 15:26:48 +0200
commit87a23092dd971b960f9065dbc0cc48be31400326 (patch)
treea2134bb9b8f6e75ade31ba9023392f28a34ab8d7 /sound/firewire
parentALSA: bebob: don't set XRUN in stop streaming (diff)
downloadlinux-dev-87a23092dd971b960f9065dbc0cc48be31400326.tar.xz
linux-dev-87a23092dd971b960f9065dbc0cc48be31400326.zip
ALSA: bebob: obsolete useless member of private structure
The private structure of this driver has 'connected' member but nowadays it's useless. This commit removes it. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/bebob/bebob.h2
-rw-r--r--sound/firewire/bebob/bebob_stream.c7
2 files changed, 0 insertions, 9 deletions
diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index c30ed44aced9..20ed2dbd8d61 100644
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -93,8 +93,6 @@ struct snd_bebob {
unsigned int midi_input_ports;
unsigned int midi_output_ports;
- bool connected;
-
struct amdtp_stream tx_stream;
struct amdtp_stream rx_stream;
struct cmp_connection out_conn;
diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c
index d6e7f13ef42d..c3cc31df49e0 100644
--- a/sound/firewire/bebob/bebob_stream.c
+++ b/sound/firewire/bebob/bebob_stream.c
@@ -422,9 +422,6 @@ static int make_both_connections(struct snd_bebob *bebob)
{
int err = 0;
- if (bebob->connected)
- return 0;
-
err = cmp_connection_establish(&bebob->out_conn,
amdtp_stream_get_max_payload(&bebob->tx_stream));
if (err < 0)
@@ -437,8 +434,6 @@ static int make_both_connections(struct snd_bebob *bebob)
return err;
}
- bebob->connected = true;
-
return 0;
}
@@ -448,8 +443,6 @@ break_both_connections(struct snd_bebob *bebob)
cmp_connection_break(&bebob->in_conn);
cmp_connection_break(&bebob->out_conn);
- bebob->connected = false;
-
/* These models seems to be in transition state for a longer time. */
if (bebob->maudio_special_quirk != NULL)
msleep(200);