lkml.org 
[lkml]   [2019]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 20/66] ASoC: stm32: dfsdm: fix debugfs warnings on entry creation
    Date
    [ Upstream commit c47255b61129857b74b0d86eaf59335348be05e0 ]

    Register platform component with a prefix, to avoid warnings
    on debugfs entries creation, due to component name
    redundancy.

    Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/stm/stm32_adfsdm.c | 21 ++++++++++++++++++---
    1 file changed, 18 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
    index 71d341b732a4d..24948b95eb19f 100644
    --- a/sound/soc/stm/stm32_adfsdm.c
    +++ b/sound/soc/stm/stm32_adfsdm.c
    @@ -304,6 +304,7 @@ MODULE_DEVICE_TABLE(of, stm32_adfsdm_of_match);
    static int stm32_adfsdm_probe(struct platform_device *pdev)
    {
    struct stm32_adfsdm_priv *priv;
    + struct snd_soc_component *component;
    int ret;

    priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
    @@ -331,9 +332,15 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
    if (IS_ERR(priv->iio_cb))
    return PTR_ERR(priv->iio_cb);

    - ret = devm_snd_soc_register_component(&pdev->dev,
    - &stm32_adfsdm_soc_platform,
    - NULL, 0);
    + component = devm_kzalloc(&pdev->dev, sizeof(*component), GFP_KERNEL);
    + if (!component)
    + return -ENOMEM;
    +#ifdef CONFIG_DEBUG_FS
    + component->debugfs_prefix = "pcm";
    +#endif
    +
    + ret = snd_soc_add_component(&pdev->dev, component,
    + &stm32_adfsdm_soc_platform, NULL, 0);
    if (ret < 0)
    dev_err(&pdev->dev, "%s: Failed to register PCM platform\n",
    __func__);
    @@ -341,12 +348,20 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
    return ret;
    }

    +static int stm32_adfsdm_remove(struct platform_device *pdev)
    +{
    + snd_soc_unregister_component(&pdev->dev);
    +
    + return 0;
    +}
    +
    static struct platform_driver stm32_adfsdm_driver = {
    .driver = {
    .name = STM32_ADFSDM_DRV_NAME,
    .of_match_table = stm32_adfsdm_of_match,
    },
    .probe = stm32_adfsdm_probe,
    + .remove = stm32_adfsdm_remove,
    };

    module_platform_driver(stm32_adfsdm_driver);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-09 21:06    [W:4.518 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site