Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-block.git] / sound / firewire / motu / motu-midi.c

diff --git a/sound/firewire/motu/motu-midi.c b/sound/firewire/motu/motu-midi.c
index 75f6b2e9ca9e2390ce1404ef1e957c6e95aa040e..46a0035df31e5ea573df1af852bed26c92024fd9 100644 (file)
--- a/sound/firewire/motu/motu-midi.c
+++ b/sound/firewire/motu/motu-midi.c
@@ -6,7 +6,7 @@
  */
 #include "motu.h"
 
-static int midi_capture_open(struct snd_rawmidi_substream *substream)
+static int midi_open(struct snd_rawmidi_substream *substream)
 {
        struct snd_motu *motu = substream->rmidi->private_data;
        int err;
@@ -17,30 +17,13 @@ static int midi_capture_open(struct snd_rawmidi_substream *substream)
 
        mutex_lock(&motu->mutex);
 
-       motu->capture_substreams++;
-       err = snd_motu_stream_start_duplex(motu, 0);
-
-       mutex_unlock(&motu->mutex);
-
-       if (err < 0)
-               snd_motu_stream_lock_release(motu);
-
-       return err;
-}
-
-static int midi_playback_open(struct snd_rawmidi_substream *substream)
-{
-       struct snd_motu *motu = substream->rmidi->private_data;
-       int err;
-
-       err = snd_motu_stream_lock_try(motu);
-       if (err < 0)
-               return err;
-
-       mutex_lock(&motu->mutex);
-
-       motu->playback_substreams++;
-       err = snd_motu_stream_start_duplex(motu, 0);
+       err = snd_motu_stream_reserve_duplex(motu, 0);
+       if (err >= 0) {
+               ++motu->substreams_counter;
+               err = snd_motu_stream_start_duplex(motu);
+               if (err < 0)
+                       --motu->substreams_counter;
+       }
 
        mutex_unlock(&motu->mutex);
 
@@ -50,28 +33,13 @@ static int midi_playback_open(struct snd_rawmidi_substream *substream)
        return err;
 }
 
-static int midi_capture_close(struct snd_rawmidi_substream *substream)
-{
-       struct snd_motu *motu = substream->rmidi->private_data;
-
-       mutex_lock(&motu->mutex);
-
-       motu->capture_substreams--;
-       snd_motu_stream_stop_duplex(motu);
-
-       mutex_unlock(&motu->mutex);
-
-       snd_motu_stream_lock_release(motu);
-       return 0;
-}
-
-static int midi_playback_close(struct snd_rawmidi_substream *substream)
+static int midi_close(struct snd_rawmidi_substream *substream)
 {
        struct snd_motu *motu = substream->rmidi->private_data;
 
        mutex_lock(&motu->mutex);
 
-       motu->playback_substreams--;
+       --motu->substreams_counter;
        snd_motu_stream_stop_duplex(motu);
 
        mutex_unlock(&motu->mutex);
@@ -128,13 +96,13 @@ static void set_midi_substream_names(struct snd_motu *motu,
 int snd_motu_create_midi_devices(struct snd_motu *motu)
 {
        static const struct snd_rawmidi_ops capture_ops = {
-               .open           = midi_capture_open,
-               .close          = midi_capture_close,
+               .open           = midi_open,
+               .close          = midi_close,
                .trigger        = midi_capture_trigger,
        };
        static const struct snd_rawmidi_ops playback_ops = {
-               .open           = midi_playback_open,
-               .close          = midi_playback_close,
+               .open           = midi_open,
+               .close          = midi_close,
                .trigger        = midi_playback_trigger,
        };
        struct snd_rawmidi *rmidi;