lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 638/849] ASoC: topology: Fix stub for snd_soc_tplg_component_remove()
    Date
    From: Mark Brown <broonie@kernel.org>

    [ Upstream commit 1198ff12cbdd5f42c032cba1d96ebc7af8024cf9 ]

    When removing the index argument from snd_soc_topology_component_remove()
    commit a5b8f71c5477f (ASoC: topology: Remove multistep topology loading)
    forgot to update the stub for !SND_SOC_TOPOLOGY use, causing build failures
    for anything that tries to make use of it.

    Fixes: a5b8f71c5477f (ASoC: topology: Remove multistep topology loading)
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Link: https://lore.kernel.org/r/20211025154844.2342120-1-broonie@kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/sound/soc-topology.h | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h
    index 4afd667e124c2..3e8a85e1e8094 100644
    --- a/include/sound/soc-topology.h
    +++ b/include/sound/soc-topology.h
    @@ -188,8 +188,7 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w,

    #else

    -static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp,
    - u32 index)
    +static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp)
    {
    return 0;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:23    [W:2.170 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site