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 0978/1157] ASoC: fsl_asrc: force cast the asrc_format type
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit c49932726de24405d45516b3f8ad2735714fdf05 ]

    Fix sparse warning:
    sound/soc/fsl/fsl_asrc.c:1177:60: sparse: warning: incorrect type in argument 3 (different base types)
    sound/soc/fsl/fsl_asrc.c:1177:60: sparse: expected unsigned int [usertype] *out_value
    sound/soc/fsl/fsl_asrc.c:1177:60: sparse: got restricted snd_pcm_format_t *
    sound/soc/fsl/fsl_asrc.c:1200:47: sparse: warning: restricted snd_pcm_format_t degrades to integer

    Fixes: 4520af41fd21 ("ASoC: fsl_asrc: Support new property fsl,asrc-format")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1658399393-28777-3-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_asrc.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
    index 20a9f8e924b3..aa5edf32d988 100644
    --- a/sound/soc/fsl/fsl_asrc.c
    +++ b/sound/soc/fsl/fsl_asrc.c
    @@ -1066,6 +1066,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
    struct resource *res;
    void __iomem *regs;
    int irq, ret, i;
    + u32 asrc_fmt = 0;
    u32 map_idx;
    char tmp[16];
    u32 width;
    @@ -1174,7 +1175,8 @@ static int fsl_asrc_probe(struct platform_device *pdev)
    return ret;
    }

    - ret = of_property_read_u32(np, "fsl,asrc-format", &asrc->asrc_format);
    + ret = of_property_read_u32(np, "fsl,asrc-format", &asrc_fmt);
    + asrc->asrc_format = (__force snd_pcm_format_t)asrc_fmt;
    if (ret) {
    ret = of_property_read_u32(np, "fsl,asrc-width", &width);
    if (ret) {
    @@ -1197,7 +1199,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
    }
    }

    - if (!(FSL_ASRC_FORMATS & (1ULL << asrc->asrc_format))) {
    + if (!(FSL_ASRC_FORMATS & pcm_format_to_bits(asrc->asrc_format))) {
    dev_warn(&pdev->dev, "unsupported width, use default S24_LE\n");
    asrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
    }
    --
    2.35.1


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