Skip to content

Commit

Permalink
ALSA: fireworks: move mutex from function callees to callers
Browse files Browse the repository at this point in the history 
Currently, critical section is protected by mutex in functions of
fireworks_stream.c. Callers increments/decrements substreams counter
before calling the functions. Moving mutex to the callers code allows
to change type of the substeram counter from atomic_t to unsigned int.

This commit is a preparation for obsoleting usage of atomic_t for
substream counter.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Sakamoto authored and Takashi Iwai committed Nov 14, 2015
1 parent 5d5563b commit ea54a37
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
8 changes: 8 additions & 0 deletions sound/firewire/fireworks/fireworks_midi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ static int midi_capture_open(struct snd_rawmidi_substream *substream)
if (err < 0)
goto end;

mutex_lock(&efw->mutex);
atomic_inc(&efw->capture_substreams);
err = snd_efw_stream_start_duplex(efw, 0);
mutex_unlock(&efw->mutex);
if (err < 0)
snd_efw_stream_lock_release(efw);

Expand All @@ -35,8 +37,10 @@ static int midi_playback_open(struct snd_rawmidi_substream *substream)
if (err < 0)
goto end;

mutex_lock(&efw->mutex);
atomic_inc(&efw->playback_substreams);
err = snd_efw_stream_start_duplex(efw, 0);
mutex_unlock(&efw->mutex);
if (err < 0)
snd_efw_stream_lock_release(efw);
end:
Expand All @@ -47,8 +51,10 @@ static int midi_capture_close(struct snd_rawmidi_substream *substream)
{
struct snd_efw *efw = substream->rmidi->private_data;

mutex_lock(&efw->mutex);
atomic_dec(&efw->capture_substreams);
snd_efw_stream_stop_duplex(efw);
mutex_unlock(&efw->mutex);

snd_efw_stream_lock_release(efw);
return 0;
Expand All @@ -58,8 +64,10 @@ static int midi_playback_close(struct snd_rawmidi_substream *substream)
{
struct snd_efw *efw = substream->rmidi->private_data;

mutex_lock(&efw->mutex);
atomic_dec(&efw->playback_substreams);
snd_efw_stream_stop_duplex(efw);
mutex_unlock(&efw->mutex);

snd_efw_stream_lock_release(efw);
return 0;
Expand Down
20 changes: 16 additions & 4 deletions sound/firewire/fireworks/fireworks_pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,11 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
if (err < 0)
return err;

if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
mutex_lock(&efw->mutex);
atomic_inc(&efw->capture_substreams);
mutex_unlock(&efw->mutex);
}

amdtp_am824_set_pcm_format(&efw->tx_stream, params_format(hw_params));

Expand All @@ -269,8 +272,11 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
if (err < 0)
return err;

if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
mutex_lock(&efw->mutex);
atomic_inc(&efw->playback_substreams);
mutex_unlock(&efw->mutex);
}

amdtp_am824_set_pcm_format(&efw->rx_stream, params_format(hw_params));

Expand All @@ -281,8 +287,11 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
{
struct snd_efw *efw = substream->private_data;

if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) {
mutex_lock(&efw->mutex);
atomic_dec(&efw->capture_substreams);
mutex_unlock(&efw->mutex);
}

snd_efw_stream_stop_duplex(efw);

Expand All @@ -292,8 +301,11 @@ static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
{
struct snd_efw *efw = substream->private_data;

if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) {
mutex_lock(&efw->mutex);
atomic_dec(&efw->playback_substreams);
mutex_unlock(&efw->mutex);
}

snd_efw_stream_stop_duplex(efw);

Expand Down
7 changes: 0 additions & 7 deletions sound/firewire/fireworks/fireworks_stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@ int snd_efw_stream_start_duplex(struct snd_efw *efw, unsigned int rate)
unsigned int curr_rate;
int err = 0;

mutex_lock(&efw->mutex);

/* Need no substreams */
if ((atomic_read(&efw->playback_substreams) == 0) &&
(atomic_read(&efw->capture_substreams) == 0))
Expand Down Expand Up @@ -286,7 +284,6 @@ int snd_efw_stream_start_duplex(struct snd_efw *efw, unsigned int rate)
}
}
end:
mutex_unlock(&efw->mutex);
return err;
}

Expand All @@ -307,16 +304,12 @@ void snd_efw_stream_stop_duplex(struct snd_efw *efw)
master_substreams = &efw->capture_substreams;
}

mutex_lock(&efw->mutex);

if (atomic_read(slave_substreams) == 0) {
stop_stream(efw, slave);

if (atomic_read(master_substreams) == 0)
stop_stream(efw, master);
}

mutex_unlock(&efw->mutex);
}

void snd_efw_stream_update_duplex(struct snd_efw *efw)
Expand Down

0 comments on commit ea54a37

Please sign in to comment.