lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 1036/1039] ASoC: SOF: topology: remove sof_load_pipeline_ipc()
    Date
    From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

    commit 7cc7b9ba21d4978d19f0e3edc2b00d44c9d66ff6 upstream.

    Remove the function sof_load_pipeline_ipc() and directly
    send the IPC instead. The pipeline core is already enabled
    with the call to sof_pipeline_core_enable() in sof_widget_setup().

    Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
    Link: https://lore.kernel.org/r/20211119192621.4096077-7-kai.vehmanen@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/sof/sof-audio.c | 3 ++-
    sound/soc/sof/sof-audio.h | 4 ----
    sound/soc/sof/topology.c | 17 -----------------
    3 files changed, 2 insertions(+), 22 deletions(-)

    --- a/sound/soc/sof/sof-audio.c
    +++ b/sound/soc/sof/sof-audio.c
    @@ -203,7 +203,8 @@ int sof_widget_setup(struct snd_sof_dev
    break;
    case snd_soc_dapm_scheduler:
    pipeline = swidget->private;
    - ret = sof_load_pipeline_ipc(sdev, pipeline, &r);
    + ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,
    + sizeof(*pipeline), &r, sizeof(r));
    break;
    default:
    hdr = swidget->private;
    --- a/sound/soc/sof/sof-audio.h
    +++ b/sound/soc/sof/sof-audio.h
    @@ -184,10 +184,6 @@ void snd_sof_control_notify(struct snd_s
    int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file);
    int snd_sof_complete_pipeline(struct snd_sof_dev *sdev,
    struct snd_sof_widget *swidget);
    -
    -int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,
    - struct sof_ipc_pipe_new *pipeline,
    - struct sof_ipc_comp_reply *r);
    int sof_pipeline_core_enable(struct snd_sof_dev *sdev,
    const struct snd_sof_widget *swidget);

    --- a/sound/soc/sof/topology.c
    +++ b/sound/soc/sof/topology.c
    @@ -1690,23 +1690,6 @@ err:
    /*
    * Pipeline Topology
    */
    -int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,
    - struct sof_ipc_pipe_new *pipeline,
    - struct sof_ipc_comp_reply *r)
    -{
    - int ret = sof_core_enable(sdev, pipeline->core);
    -
    - if (ret < 0)
    - return ret;
    -
    - ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,
    - sizeof(*pipeline), r, sizeof(*r));
    - if (ret < 0)
    - dev_err(sdev->dev, "error: load pipeline ipc failure\n");
    -
    - return ret;
    -}
    -
    static int sof_widget_load_pipeline(struct snd_soc_component *scomp, int index,
    struct snd_sof_widget *swidget,
    struct snd_soc_tplg_dapm_widget *tw)

    \
     
     \ /
      Last update: 2022-01-25 04:10    [W:3.089 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site