ASoC: Intel: sst: Remove unnecessary sst_init_stream() function

sst_init_stream() has only one caller and all its function arguments are
unused. Inline it on the one call site and remove it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index 1f3107909044110b2b461af98d490d7bf5900e69..164b0f674c209063e2b3bbb1189b41d214a52877 100644 (file)
--- a/sound/soc/intel/atom/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
@@ -494,8 +494,6 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
 
 void sst_process_pending_msg(struct work_struct *work);
 int sst_assign_pvt_id(struct intel_sst_drv *sst_drv_ctx);
-void sst_init_stream(struct stream_info *stream,
-               int codec, int sst_id, int ops, u8 slot);
 int sst_validate_strid(struct intel_sst_drv *sst_drv_ctx, int str_id);
 struct stream_info *get_stream_info(struct intel_sst_drv *sst_drv_ctx,
                int str_id);

diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index d7d38b0f68dbeaf139b119ba8162c69bb8eb1aee..af93244b48686f48ac08f8f8e55269911545b8ed 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -360,13 +360,6 @@ int sst_assign_pvt_id(struct intel_sst_drv *drv)
        return local;
 }
 
-void sst_init_stream(struct stream_info *stream,
-               int codec, int sst_id, int ops, u8 slot)
-{
-       stream->status = STREAM_INIT;
-       stream->prev = STREAM_UN_INIT;
-}
-
 int sst_validate_strid(
                struct intel_sst_drv *sst_drv_ctx, int str_id)
 {

diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
index b082b0922a7a5d0b7c3c7a8ad388cf33d1c386e7..7cf5dd1993bcbf3300531bc86d6dccd8a443f92e 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_stream.c
+++ b/sound/soc/intel/atom/sst/sst_stream.c
@@ -83,6 +83,8 @@ int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
 
        pipe_id = str_params->device_type;
        task_id = str_params->task;
+       sst_drv_ctx->streams[str_id].status = STREAM_INIT;
+       sst_drv_ctx->streams[str_id].prev = STREAM_UN_INIT;
        sst_drv_ctx->streams[str_id].pipe_id = pipe_id;
        sst_drv_ctx->streams[str_id].task_id = task_id;
        sst_drv_ctx->streams[str_id].num_ch = num_ch;
@@ -100,9 +102,6 @@ int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
                        pipe_id, task_id);
 
        /* allocate device type context */
-       sst_init_stream(&sst_drv_ctx->streams[str_id], alloc_param.codec_type,
-                       str_id, alloc_param.operation, 0);
-
        dev_dbg(sst_drv_ctx->dev, "Alloc for str %d pipe %#x\n",
                        str_id, pipe_id);
        ret = sst_prepare_and_post_msg(sst_drv_ctx, task_id, IPC_CMD,