summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/atom
diff options
context:
space:
mode:
authorHans de Goede2018-02-18 23:01:39 +0100
committerMark Brown2018-03-01 17:22:45 +0100
commitbd47469c9985b50831a55bdda5a36f4672452764 (patch)
tree5ca83102bc62f2c9cdc9e248fcaaeebc55767029 /sound/soc/intel/atom
parentASoC: Intel: sst: Fix error-code check in sst_pause_stream() (diff)
downloadkernel-qcow2-linux-bd47469c9985b50831a55bdda5a36f4672452764.tar.gz
kernel-qcow2-linux-bd47469c9985b50831a55bdda5a36f4672452764.tar.xz
kernel-qcow2-linux-bd47469c9985b50831a55bdda5a36f4672452764.zip
ASoC: Intel: sst: Remove 2 unused members from stream_info struct
Remove the unused ops and str_id members from the stream_info struct. While at it also remove some kernel-doc comments for members which have already been removed in the past. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/atom')
-rw-r--r--sound/soc/intel/atom/sst/sst.h7
-rw-r--r--sound/soc/intel/atom/sst/sst_pvt.c1
2 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index e02e2b4cc08f..1f3107909044 100644
--- a/sound/soc/intel/atom/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
@@ -181,21 +181,15 @@ struct sst_block {
*
* @status : stream current state
* @prev : stream prev state
- * @ops : stream operation pb/cp/drm...
- * @bufs: stream buffer list
* @lock : stream mutex for protecting state
* @pcm_substream : PCM substream
* @period_elapsed : PCM period elapsed callback
* @sfreq : stream sampling freq
- * @str_type : stream type
* @cumm_bytes : cummulative bytes decoded
- * @str_type : stream type
- * @src : stream source
*/
struct stream_info {
unsigned int status;
unsigned int prev;
- unsigned int ops;
struct mutex lock;
void *pcm_substream;
@@ -212,7 +206,6 @@ struct stream_info {
unsigned int num_ch;
unsigned int pipe_id;
- unsigned int str_id;
unsigned int task_id;
};
diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index b1e6b8f34a6a..d7d38b0f68db 100644
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -365,7 +365,6 @@ void sst_init_stream(struct stream_info *stream,
{
stream->status = STREAM_INIT;
stream->prev = STREAM_UN_INIT;
- stream->ops = ops;
}
int sst_validate_strid(