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 0980/1157] ASoC: fsl_easrc: use snd_pcm_format_t type for sample_format
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit de27216cf2d645c2fd14e513707bdcd54e5b1de4 ]

    Fix sparse warning:
    sound/soc/fsl/fsl_easrc.c:562:33: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:563:34: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:565:38: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:566:39: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:608:33: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:609:34: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:615:40: sparse: warning: restricted snd_pcm_format_t degrades to integer
    sound/soc/fsl/fsl_easrc.c:616:41: sparse: warning: restricted snd_pcm_format_t degrades to integer

    sound/soc/fsl/fsl_easrc.c:1465:51: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/fsl_easrc.c:1465:51: sparse: expected unsigned int sample_format
    sound/soc/fsl/fsl_easrc.c:1465:51: sparse: got restricted snd_pcm_format_t [usertype] format
    sound/soc/fsl/fsl_easrc.c:1467:52: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/fsl_easrc.c:1467:52: sparse: expected unsigned int sample_format
    sound/soc/fsl/fsl_easrc.c:1467:52: sparse: got restricted snd_pcm_format_t [usertype] asrc_format
    sound/soc/fsl/fsl_easrc.c:1470:52: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/fsl_easrc.c:1470:52: sparse: expected unsigned int sample_format
    sound/soc/fsl/fsl_easrc.c:1470:52: sparse: got restricted snd_pcm_format_t [usertype] format
    sound/soc/fsl/fsl_easrc.c:1472:51: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/fsl_easrc.c:1472:51: sparse: expected unsigned int sample_format
    sound/soc/fsl/fsl_easrc.c:1472:51: sparse: got restricted snd_pcm_format_t [usertype] asrc_format
    sound/soc/fsl/fsl_easrc.c:1484:41: sparse: warning: incorrect type in argument 2 (different base types)
    sound/soc/fsl/fsl_easrc.c:1484:41: sparse: expected restricted snd_pcm_format_t [usertype] *in_raw_format
    sound/soc/fsl/fsl_easrc.c:1484:41: sparse: got unsigned int *
    sound/soc/fsl/fsl_easrc.c:1485:41: sparse: warning: incorrect type in argument 3 (different base types)
    sound/soc/fsl/fsl_easrc.c:1485:41: sparse: expected restricted snd_pcm_format_t [usertype] *out_raw_format
    sound/soc/fsl/fsl_easrc.c:1485:41: sparse: got unsigned int *
    sound/soc/fsl/fsl_easrc.c:1937:60: sparse: warning: incorrect type in argument 3 (different base types)
    sound/soc/fsl/fsl_easrc.c:1937:60: sparse: expected unsigned int [usertype] *out_value
    sound/soc/fsl/fsl_easrc.c:1937:60: sparse: got restricted snd_pcm_format_t *
    sound/soc/fsl/fsl_easrc.c:1943:49: sparse: warning: restricted snd_pcm_format_t degrades to integer

    Fixes: 955ac624058f ("ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1658399393-28777-5-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_easrc.c | 9 ++++++---
    sound/soc/fsl/fsl_easrc.h | 2 +-
    2 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
    index be14f84796cb..cf0e10d17dbe 100644
    --- a/sound/soc/fsl/fsl_easrc.c
    +++ b/sound/soc/fsl/fsl_easrc.c
    @@ -476,7 +476,8 @@ static int fsl_easrc_prefilter_config(struct fsl_asrc *easrc,
    struct fsl_asrc_pair *ctx;
    struct device *dev;
    u32 inrate, outrate, offset = 0;
    - u32 in_s_rate, out_s_rate, in_s_fmt, out_s_fmt;
    + u32 in_s_rate, out_s_rate;
    + snd_pcm_format_t in_s_fmt, out_s_fmt;
    int ret, i;

    if (!easrc)
    @@ -1873,6 +1874,7 @@ static int fsl_easrc_probe(struct platform_device *pdev)
    struct resource *res;
    struct device_node *np;
    void __iomem *regs;
    + u32 asrc_fmt = 0;
    int ret, irq;

    easrc = devm_kzalloc(dev, sizeof(*easrc), GFP_KERNEL);
    @@ -1933,13 +1935,14 @@ static int fsl_easrc_probe(struct platform_device *pdev)
    return ret;
    }

    - ret = of_property_read_u32(np, "fsl,asrc-format", &easrc->asrc_format);
    + ret = of_property_read_u32(np, "fsl,asrc-format", &asrc_fmt);
    + easrc->asrc_format = (__force snd_pcm_format_t)asrc_fmt;
    if (ret) {
    dev_err(dev, "failed to asrc format\n");
    return ret;
    }

    - if (!(FSL_EASRC_FORMATS & (1ULL << easrc->asrc_format))) {
    + if (!(FSL_EASRC_FORMATS & (pcm_format_to_bits(easrc->asrc_format)))) {
    dev_warn(dev, "unsupported format, switching to S24_LE\n");
    easrc->asrc_format = SNDRV_PCM_FORMAT_S24_LE;
    }
    diff --git a/sound/soc/fsl/fsl_easrc.h b/sound/soc/fsl/fsl_easrc.h
    index 86d5c360d4f5..7c70dac52713 100644
    --- a/sound/soc/fsl/fsl_easrc.h
    +++ b/sound/soc/fsl/fsl_easrc.h
    @@ -569,7 +569,7 @@ struct fsl_easrc_io_params {
    unsigned int access_len;
    unsigned int fifo_wtmk;
    unsigned int sample_rate;
    - unsigned int sample_format;
    + snd_pcm_format_t sample_format;
    unsigned int norm_rate;
    };

    --
    2.35.1


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