ALSA: firewire-motu: minor code refactoring to stop isochronous context
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Mon, 17 Jun 2019 08:15:06 +0000 (17:15 +0900)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 Jun 2019 06:45:30 +0000 (08:45 +0200)
The helper function to stop isochronous context is superfluous. This
commit removes it with simpler codes.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/firewire/motu/motu-stream.c

index cb01f1d784f13c5aa648be100419a9dcb145b6bd..4fbec35eaad542f5b4fb8680b6019d1ad8827d11 100644 (file)
@@ -142,19 +142,6 @@ static int start_isoc_ctx(struct snd_motu *motu, struct amdtp_stream *stream)
        return 0;
 }
 
-static void stop_isoc_ctx(struct snd_motu *motu, struct amdtp_stream *stream)
-{
-       struct fw_iso_resources *resources;
-
-       if (stream == &motu->rx_stream)
-               resources = &motu->rx_resources;
-       else
-               resources = &motu->tx_resources;
-
-       amdtp_stream_stop(stream);
-       fw_iso_resources_free(resources);
-}
-
 int snd_motu_stream_cache_packet_formats(struct snd_motu *motu)
 {
        int err;
@@ -292,11 +279,11 @@ stop_streams:
 void snd_motu_stream_stop_duplex(struct snd_motu *motu)
 {
        if (motu->substreams_counter == 0) {
-               if (amdtp_stream_running(&motu->tx_stream))
-                       stop_isoc_ctx(motu, &motu->tx_stream);
+               amdtp_stream_stop(&motu->tx_stream);
+               amdtp_stream_stop(&motu->rx_stream);
 
-               if (amdtp_stream_running(&motu->rx_stream))
-                       stop_isoc_ctx(motu, &motu->rx_stream);
+               fw_iso_resources_free(&motu->tx_resources);
+               fw_iso_resources_free(&motu->rx_resources);
        }
 }