hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: Intel: sst: Remove unused STREAM_DECODE and STREAM_RESET states 

STREAM_DECODE is completely unused, status == STREAM_RESET was checked
for, but never set, remove both.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Hans de Goede 2018-02-18 23:01:41 +01:00 committed by Mark Brown
parent 8cf732bbd8
commit de9833476d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/intel/atom/sst/sst.h
View File

@ -65,9 +65,7 @@ enum sst_stream_states {
STREAM_UN_INIT = 0, /* Freed/Not used stream */ STREAM_UN_INIT = 0, /* Freed/Not used stream */
STREAM_RUNNING = 1, /* Running */ STREAM_RUNNING = 1, /* Running */
STREAM_PAUSED = 2, /* Paused stream */ STREAM_PAUSED = 2, /* Paused stream */
STREAM_DECODE = 3, /* stream is in decoding only state */ STREAM_INIT = 3, /* stream init, waiting for data */
STREAM_INIT = 4, /* stream init, waiting for data */
STREAM_RESET = 5, /* force reset on recovery */
}; };
enum sst_ram_type { enum sst_ram_type {

19
sound/soc/intel/atom/sst/sst_drv_interface.c
View File

@ -238,16 +238,7 @@ static int sst_cdev_close(struct device *dev, unsigned int str_id)
return -EINVAL; return -EINVAL;
} }
if (stream->status == STREAM_RESET) {
dev_dbg(dev, "stream in reset state...\n");
stream->status = STREAM_UN_INIT;
retval = 0;
goto put;
}
retval = sst_free_stream(ctx, str_id); retval = sst_free_stream(ctx, str_id);
put:
stream->compr_cb_param = NULL; stream->compr_cb_param = NULL;
stream->compr_cb = NULL; stream->compr_cb = NULL;
@ -256,7 +247,6 @@ put:
dev_dbg(dev, "End\n"); dev_dbg(dev, "End\n");
return retval; return retval;
} }
static int sst_cdev_ack(struct device *dev, unsigned int str_id, static int sst_cdev_ack(struct device *dev, unsigned int str_id,
@ -486,16 +476,7 @@ static int sst_close_pcm_stream(struct device *dev, unsigned int str_id)
return -EINVAL; return -EINVAL;
} }
if (stream->status == STREAM_RESET) {
/* silently fail here as we have cleaned the stream earlier */
dev_dbg(ctx->dev, "stream in reset state...\n");
retval = 0;
goto put;
}
retval = free_stream_context(ctx, str_id); retval = free_stream_context(ctx, str_id);
put:
stream->pcm_substream = NULL; stream->pcm_substream = NULL;
stream->status = STREAM_UN_INIT; stream->status = STREAM_UN_INIT;
stream->period_elapsed = NULL; stream->period_elapsed = NULL;