Commit 23cb0767 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: firewire: Replace runtime->status->state reference to runtime->state

The recent change in ALSA core allows drivers to get the current PCM
state directly from runtime object.  Replace the calls accordingly.
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20220926135558.26580-5-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f7efa9b8
...@@ -214,7 +214,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -214,7 +214,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_bebob *bebob = substream->private_data; struct snd_bebob *bebob = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -236,7 +236,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -236,7 +236,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&bebob->mutex); mutex_lock(&bebob->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
bebob->substreams_counter--; bebob->substreams_counter--;
snd_bebob_stream_stop_duplex(bebob); snd_bebob_stream_stop_duplex(bebob);
......
...@@ -266,7 +266,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -266,7 +266,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_dice *dice = substream->private_data; struct snd_dice *dice = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int events_per_period = params_period_size(hw_params); unsigned int events_per_period = params_period_size(hw_params);
unsigned int events_per_buffer = params_buffer_size(hw_params); unsigned int events_per_buffer = params_buffer_size(hw_params);
...@@ -293,7 +293,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -293,7 +293,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&dice->mutex); mutex_lock(&dice->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--dice->substreams_counter; --dice->substreams_counter;
snd_dice_stream_stop_duplex(dice); snd_dice_stream_stop_duplex(dice);
......
...@@ -190,7 +190,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -190,7 +190,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_dg00x *dg00x = substream->private_data; struct snd_dg00x *dg00x = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -212,7 +212,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -212,7 +212,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&dg00x->mutex); mutex_lock(&dg00x->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--dg00x->substreams_counter; --dg00x->substreams_counter;
snd_dg00x_stream_stop_duplex(dg00x); snd_dg00x_stream_stop_duplex(dg00x);
......
...@@ -230,7 +230,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -230,7 +230,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_ff *ff = substream->private_data; struct snd_ff *ff = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -252,7 +252,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -252,7 +252,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&ff->mutex); mutex_lock(&ff->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--ff->substreams_counter; --ff->substreams_counter;
snd_ff_stream_stop_duplex(ff); snd_ff_stream_stop_duplex(ff);
......
...@@ -250,7 +250,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -250,7 +250,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_efw *efw = substream->private_data; struct snd_efw *efw = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -272,7 +272,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -272,7 +272,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&efw->mutex); mutex_lock(&efw->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--efw->substreams_counter; --efw->substreams_counter;
snd_efw_stream_stop_duplex(efw); snd_efw_stream_stop_duplex(efw);
......
...@@ -210,7 +210,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -210,7 +210,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_motu *motu = substream->private_data; struct snd_motu *motu = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -232,7 +232,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -232,7 +232,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&motu->mutex); mutex_lock(&motu->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--motu->substreams_counter; --motu->substreams_counter;
snd_motu_stream_stop_duplex(motu); snd_motu_stream_stop_duplex(motu);
......
...@@ -239,7 +239,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream, ...@@ -239,7 +239,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
struct snd_oxfw *oxfw = substream->private_data; struct snd_oxfw *oxfw = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int channels = params_channels(hw_params); unsigned int channels = params_channels(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
...@@ -262,7 +262,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream, ...@@ -262,7 +262,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
struct snd_oxfw *oxfw = substream->private_data; struct snd_oxfw *oxfw = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int channels = params_channels(hw_params); unsigned int channels = params_channels(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
...@@ -286,7 +286,7 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream) ...@@ -286,7 +286,7 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&oxfw->mutex); mutex_lock(&oxfw->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--oxfw->substreams_count; --oxfw->substreams_count;
snd_oxfw_stream_stop_duplex(oxfw); snd_oxfw_stream_stop_duplex(oxfw);
...@@ -301,7 +301,7 @@ static int pcm_playback_hw_free(struct snd_pcm_substream *substream) ...@@ -301,7 +301,7 @@ static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&oxfw->mutex); mutex_lock(&oxfw->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--oxfw->substreams_count; --oxfw->substreams_count;
snd_oxfw_stream_stop_duplex(oxfw); snd_oxfw_stream_stop_duplex(oxfw);
......
...@@ -119,7 +119,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -119,7 +119,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_tscm *tscm = substream->private_data; struct snd_tscm *tscm = substream->private_data;
int err = 0; int err = 0;
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int frames_per_period = params_period_size(hw_params); unsigned int frames_per_period = params_period_size(hw_params);
unsigned int frames_per_buffer = params_buffer_size(hw_params); unsigned int frames_per_buffer = params_buffer_size(hw_params);
...@@ -141,7 +141,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream) ...@@ -141,7 +141,7 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&tscm->mutex); mutex_lock(&tscm->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN) if (substream->runtime->state != SNDRV_PCM_STATE_OPEN)
--tscm->substreams_counter; --tscm->substreams_counter;
snd_tscm_stream_stop_duplex(tscm); snd_tscm_stream_stop_duplex(tscm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment