ALSA: firewire: oxfw: Use guard() for mutex locks

Replace the manual mutex lock/unlock pairs with guard() for code
simplification.

Only code refactoring, and no behavior change.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250828132802.9032-7-tiwai@suse.de

diff --git a/sound/firewire/oxfw/oxfw-midi.c b/sound/firewire/oxfw/oxfw-midi.c
index c215fa6f7a03713e946b276016fc80f5585d4d9e..7f757f02a877c5fea70112eaa81ea2bf95887b29 100644 (file)
--- a/sound/firewire/oxfw/oxfw-midi.c
+++ b/sound/firewire/oxfw/oxfw-midi.c
@@ -16,18 +16,16 @@ static int midi_capture_open(struct snd_rawmidi_substream *substream)
        if (err < 0)
                return err;
 
-       mutex_lock(&oxfw->mutex);
-
-       err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream, 0, 0, 0, 0);
-       if (err >= 0) {
-               ++oxfw->substreams_count;
-               err = snd_oxfw_stream_start_duplex(oxfw);
-               if (err < 0)
-                       --oxfw->substreams_count;
+       scoped_guard(mutex, &oxfw->mutex) {
+               err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream, 0, 0, 0, 0);
+               if (err >= 0) {
+                       ++oxfw->substreams_count;
+                       err = snd_oxfw_stream_start_duplex(oxfw);
+                       if (err < 0)
+                               --oxfw->substreams_count;
+               }
        }
 
-       mutex_unlock(&oxfw->mutex);
-
        if (err < 0)
                snd_oxfw_stream_lock_release(oxfw);
 
@@ -43,16 +41,14 @@ static int midi_playback_open(struct snd_rawmidi_substream *substream)
        if (err < 0)
                return err;
 
-       mutex_lock(&oxfw->mutex);
-
-       err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream, 0, 0, 0, 0);
-       if (err >= 0) {
-               ++oxfw->substreams_count;
-               err = snd_oxfw_stream_start_duplex(oxfw);
+       scoped_guard(mutex, &oxfw->mutex) {
+               err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream, 0, 0, 0, 0);
+               if (err >= 0) {
+                       ++oxfw->substreams_count;
+                       err = snd_oxfw_stream_start_duplex(oxfw);
+               }
        }
 
-       mutex_unlock(&oxfw->mutex);
-
        if (err < 0)
                snd_oxfw_stream_lock_release(oxfw);
 
@@ -63,12 +59,10 @@ static int midi_capture_close(struct snd_rawmidi_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->rmidi->private_data;
 
-       mutex_lock(&oxfw->mutex);
-
-       --oxfw->substreams_count;
-       snd_oxfw_stream_stop_duplex(oxfw);
-
-       mutex_unlock(&oxfw->mutex);
+       scoped_guard(mutex, &oxfw->mutex) {
+               --oxfw->substreams_count;
+               snd_oxfw_stream_stop_duplex(oxfw);
+       }
 
        snd_oxfw_stream_lock_release(oxfw);
        return 0;
@@ -78,12 +72,10 @@ static int midi_playback_close(struct snd_rawmidi_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->rmidi->private_data;
 
-       mutex_lock(&oxfw->mutex);
-
-       --oxfw->substreams_count;
-       snd_oxfw_stream_stop_duplex(oxfw);
-
-       mutex_unlock(&oxfw->mutex);
+       scoped_guard(mutex, &oxfw->mutex) {
+               --oxfw->substreams_count;
+               snd_oxfw_stream_stop_duplex(oxfw);
+       }
 
        snd_oxfw_stream_lock_release(oxfw);
        return 0;

diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index e13dc817fc280882b60b2dd46c50056b567bcb0d..774b8a7637951d6401bba440a25e4781fcd9839c 100644 (file)
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -181,42 +181,34 @@ static int pcm_open(struct snd_pcm_substream *substream)
        if (err < 0)
                goto err_locked;
 
-       mutex_lock(&oxfw->mutex);
-
-       // When source of clock is not internal or any stream is reserved for
-       // transmission of PCM frames, the available sampling rate is limited
-       // at current one.
-       if (oxfw->substreams_count > 0 && d->events_per_period > 0) {
-               unsigned int frames_per_period = d->events_per_period;
-               unsigned int frames_per_buffer = d->events_per_buffer;
-
-               err = limit_to_current_params(substream);
-               if (err < 0) {
-                       mutex_unlock(&oxfw->mutex);
-                       goto err_locked;
-               }
-
-               if (frames_per_period > 0) {
-                       err = snd_pcm_hw_constraint_minmax(substream->runtime,
-                                       SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                                       frames_per_period, frames_per_period);
-                       if (err < 0) {
-                               mutex_unlock(&oxfw->mutex);
+       scoped_guard(mutex, &oxfw->mutex) {
+               // When source of clock is not internal or any stream is reserved for
+               // transmission of PCM frames, the available sampling rate is limited
+               // at current one.
+               if (oxfw->substreams_count > 0 && d->events_per_period > 0) {
+                       unsigned int frames_per_period = d->events_per_period;
+                       unsigned int frames_per_buffer = d->events_per_buffer;
+
+                       err = limit_to_current_params(substream);
+                       if (err < 0)
                                goto err_locked;
-                       }
 
-                       err = snd_pcm_hw_constraint_minmax(substream->runtime,
-                                       SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-                                       frames_per_buffer, frames_per_buffer);
-                       if (err < 0) {
-                               mutex_unlock(&oxfw->mutex);
-                               goto err_locked;
+                       if (frames_per_period > 0) {
+                               err = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                                                  SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                                                  frames_per_period, frames_per_period);
+                               if (err < 0)
+                                       goto err_locked;
+
+                               err = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                                                  SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                                                  frames_per_buffer, frames_per_buffer);
+                               if (err < 0)
+                                       goto err_locked;
                        }
                }
        }
 
-       mutex_unlock(&oxfw->mutex);
-
        snd_pcm_set_sync(substream);
 
        return 0;
@@ -245,13 +237,12 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
                unsigned int frames_per_period = params_period_size(hw_params);
                unsigned int frames_per_buffer = params_buffer_size(hw_params);
 
-               mutex_lock(&oxfw->mutex);
+               guard(mutex)(&oxfw->mutex);
                err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream,
                                        rate, channels, frames_per_period,
                                        frames_per_buffer);
                if (err >= 0)
                        ++oxfw->substreams_count;
-               mutex_unlock(&oxfw->mutex);
        }
 
        return err;
@@ -268,13 +259,12 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
                unsigned int frames_per_period = params_period_size(hw_params);
                unsigned int frames_per_buffer = params_buffer_size(hw_params);
 
-               mutex_lock(&oxfw->mutex);
+               guard(mutex)(&oxfw->mutex);
                err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream,
                                        rate, channels, frames_per_period,
                                        frames_per_buffer);
                if (err >= 0)
                        ++oxfw->substreams_count;
-               mutex_unlock(&oxfw->mutex);
        }
 
        return err;
@@ -284,30 +274,26 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->private_data;
 
-       mutex_lock(&oxfw->mutex);
+       guard(mutex)(&oxfw->mutex);
 
        if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
                --oxfw->substreams_count;
 
        snd_oxfw_stream_stop_duplex(oxfw);
 
-       mutex_unlock(&oxfw->mutex);
-
        return 0;
 }
 static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->private_data;
 
-       mutex_lock(&oxfw->mutex);
+       guard(mutex)(&oxfw->mutex);
 
        if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
                --oxfw->substreams_count;
 
        snd_oxfw_stream_stop_duplex(oxfw);
 
-       mutex_unlock(&oxfw->mutex);
-
        return 0;
 }
 
@@ -316,30 +302,28 @@ static int pcm_capture_prepare(struct snd_pcm_substream *substream)
        struct snd_oxfw *oxfw = substream->private_data;
        int err;
 
-       mutex_lock(&oxfw->mutex);
-       err = snd_oxfw_stream_start_duplex(oxfw);
-       mutex_unlock(&oxfw->mutex);
-       if (err < 0)
-               goto end;
+       scoped_guard(mutex, &oxfw->mutex) {
+               err = snd_oxfw_stream_start_duplex(oxfw);
+               if (err < 0)
+                       return err;
+       }
 
        amdtp_stream_pcm_prepare(&oxfw->tx_stream);
-end:
-       return err;
+       return 0;
 }
 static int pcm_playback_prepare(struct snd_pcm_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->private_data;
        int err;
 
-       mutex_lock(&oxfw->mutex);
-       err = snd_oxfw_stream_start_duplex(oxfw);
-       mutex_unlock(&oxfw->mutex);
-       if (err < 0)
-               goto end;
+       scoped_guard(mutex, &oxfw->mutex) {
+               err = snd_oxfw_stream_start_duplex(oxfw);
+               if (err < 0)
+                       return err;
+       }
 
        amdtp_stream_pcm_prepare(&oxfw->rx_stream);
-end:
-       return err;
+       return 0;
 }
 
 static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 7a985f3cb8f619b579daa8c4aa0b2f0908d92523..5039bd79b18ed39c3193a4c85fd3446d78cd9146 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -283,9 +283,8 @@ static void oxfw_bus_reset(struct fw_unit *unit)
        fcp_bus_reset(oxfw->unit);
 
        if (oxfw->has_output || oxfw->has_input) {
-               mutex_lock(&oxfw->mutex);
+               guard(mutex)(&oxfw->mutex);
                snd_oxfw_stream_update_duplex(oxfw);
-               mutex_unlock(&oxfw->mutex);
        }
 
        if (oxfw->quirks & SND_OXFW_QUIRK_SCS_TRANSACTION)