lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0981/1157] ASoC: imx-card: use snd_pcm_format_t type for asrc_format
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit 409a8652e909e323c715f3088e6c3133e37c8881 ]

    Fix sparse warning:
    sound/soc/fsl/imx-card.c:653:59: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/imx-card.c:653:59: sparse: expected unsigned int [usertype] asrc_format
    sound/soc/fsl/imx-card.c:653:59: sparse: got restricted snd_pcm_format_t [usertype]
    sound/soc/fsl/imx-card.c:655:59: sparse: warning: incorrect type in assignment (different base types)
    sound/soc/fsl/imx-card.c:655:59: sparse: expected unsigned int [usertype] asrc_format
    sound/soc/fsl/imx-card.c:655:59: sparse: got restricted snd_pcm_format_t [usertype]

    Fixes: aa736700f42f ("ASoC: imx-card: Add imx-card machine driver")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1658399393-28777-6-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/imx-card.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
    index c0eb218a254b..4a8609b0d700 100644
    --- a/sound/soc/fsl/imx-card.c
    +++ b/sound/soc/fsl/imx-card.c
    @@ -118,7 +118,7 @@ struct imx_card_data {
    struct snd_soc_card card;
    int num_dapm_routes;
    u32 asrc_rate;
    - u32 asrc_format;
    + snd_pcm_format_t asrc_format;
    };

    static struct imx_akcodec_fs_mul ak4458_fs_mul[] = {
    @@ -474,7 +474,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

    mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
    snd_mask_none(mask);
    - snd_mask_set(mask, data->asrc_format);
    + snd_mask_set(mask, (__force unsigned int)data->asrc_format);

    return 0;
    }
    @@ -493,6 +493,7 @@ static int imx_card_parse_of(struct imx_card_data *data)
    struct dai_link_data *link_data;
    struct of_phandle_args args;
    int ret, num_links;
    + u32 asrc_fmt = 0;
    u32 width;

    ret = snd_soc_of_parse_card_name(card, "model");
    @@ -639,7 +640,8 @@ static int imx_card_parse_of(struct imx_card_data *data)
    goto err;
    }

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


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