diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 006f01922439..bc88d6f964da 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -59,7 +59,6 @@ struct snd_compr_runtime { * @direction: stream direction, playback/recording * @metadata_set: metadata set flag, true when set * @next_track: has userspace signal next track transition, true when set - * @partial_drain: undergoing partial_drain for stream, true when set * @private_data: pointer to DSP private data */ struct snd_compr_stream { @@ -71,7 +70,6 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; - bool partial_drain; void *private_data; }; @@ -175,13 +173,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - /* for partial_drain case we are back to running state on success */ - if (stream->partial_drain) { - stream->runtime->state = SNDRV_PCM_STATE_RUNNING; - stream->partial_drain = false; /* clear this flag as well */ - } else { - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - } + stream->runtime->state = SNDRV_PCM_STATE_SETUP; wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 1afa06b80f06..f34ce564d92c 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -722,9 +722,6 @@ static int snd_compr_stop(struct snd_compr_stream *stream) retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { - /* clear flags and stop any drain wait */ - stream->partial_drain = false; - stream->metadata_set = false; snd_compr_drain_notify(stream); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; @@ -882,7 +879,6 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) if (stream->next_track == false) return -EPERM; - stream->partial_drain = true; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); if (retval) { pr_debug("Partial drain returned failure\n");