lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0979/1157] ASoC: fsl-asoc-card: force cast the asrc_format type
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit 6c7b077dad62178c33f9a3ae17f90d6b0bf6e2e5 ]

    Fix sparse warning:
    sound/soc/fsl/fsl-asoc-card.c:833:45: sparse: warning: incorrect type in argument 3 (different base types)
    sound/soc/fsl/fsl-asoc-card.c:833:45: sparse: expected unsigned int [usertype] *out_value
    sound/soc/fsl/fsl-asoc-card.c:833:45: sparse: got restricted snd_pcm_format_t *

    Fixes: 859e364302c5 ("ASoC: fsl-asoc-card: Support new property fsl, asrc-format")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1658399393-28777-4-git-send-email-shengjiu.wang@nxp.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/fsl-asoc-card.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
    index d9a0d4768c4d..c836848ef0a6 100644
    --- a/sound/soc/fsl/fsl-asoc-card.c
    +++ b/sound/soc/fsl/fsl-asoc-card.c
    @@ -537,6 +537,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
    struct device *codec_dev = NULL;
    const char *codec_dai_name;
    const char *codec_dev_name;
    + u32 asrc_fmt = 0;
    u32 width;
    int ret;

    @@ -829,8 +830,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
    goto asrc_fail;
    }

    - ret = of_property_read_u32(asrc_np, "fsl,asrc-format",
    - &priv->asrc_format);
    + ret = of_property_read_u32(asrc_np, "fsl,asrc-format", &asrc_fmt);
    + priv->asrc_format = (__force snd_pcm_format_t)asrc_fmt;
    if (ret) {
    /* Fallback to old binding; translate to asrc_format */
    ret = of_property_read_u32(asrc_np, "fsl,asrc-width",
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:50    [W:4.070 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site