]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: fsl_asrc_m2m: force cast for snd_pcm_format_t type
authorShengjiu Wang <shengjiu.wang@nxp.com>
Wed, 18 Dec 2024 02:43:58 +0000 (10:43 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 18 Dec 2024 14:17:40 +0000 (14:17 +0000)
Fix sparse warnings:

fsl_asrc_m2m.c:360:45: sparse: warning: incorrect type in argument 1 (different base types)
fsl_asrc_m2m.c:360:45: sparse:    expected restricted snd_pcm_format_t [usertype] pcm_forma
fsl_asrc_m2m.c:360:45: sparse:    got unsigned int [usertype] format
fsl_asrc_m2m.c:361:41: sparse: warning: incorrect type in assignment (different base types)
fsl_asrc_m2m.c:361:41: sparse:    expected restricted snd_pcm_format_t
fsl_asrc_m2m.c:361:41: sparse:    got unsigned int [usertype] format
fsl_asrc_m2m.c:365:45: sparse: warning: incorrect type in argument 1 (different base types)
fsl_asrc_m2m.c:365:45: sparse:    expected restricted snd_pcm_format_t [usertype] pcm_forma
fsl_asrc_m2m.c:365:45: sparse:    got unsigned int [usertype] pcm_format
fsl_asrc_m2m.c:366:42: sparse: warning: incorrect type in assignment (different base types)
fsl_asrc_m2m.c:366:42: sparse:    expected restricted snd_pcm_format_t
fsl_asrc_m2m.c:366:42: sparse:    got unsigned int [usertype] pcm_format
fsl_asrc_m2m.c:595:54: sparse: warning: incorrect type in assignment (different base types)
fsl_asrc_m2m.c:595:54: sparse:    expected unsigned int [usertype] formats
fsl_asrc_m2m.c:595:54: sparse:    got restricted snd_pcm_format_t [assigned] [usertype] k

Fixes: 24a01710f627 ("ASoC: fsl_asrc_m2m: Add memory to memory function")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202412180043.PAA4t4sQ-lkp@intel.com/
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/20241218024358.3022635-1-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/fsl_asrc_m2m.c

index f266a3f5fd481c82f709f0332feff1d875bcc49d..4906843e2a8fd1a08e22e5b7dfb6505b333ee1c3 100644 (file)
@@ -357,13 +357,13 @@ static int fsl_asrc_m2m_comp_set_params(struct snd_compr_stream *stream,
        if (ret)
                return -EINVAL;
 
-       if (pcm_format_to_bits(params->codec.format) & cap.fmt_in)
-               pair->sample_format[IN] = params->codec.format;
+       if (pcm_format_to_bits((__force snd_pcm_format_t)params->codec.format) & cap.fmt_in)
+               pair->sample_format[IN] = (__force snd_pcm_format_t)params->codec.format;
        else
                return -EINVAL;
 
-       if (pcm_format_to_bits(params->codec.pcm_format) & cap.fmt_out)
-               pair->sample_format[OUT] = params->codec.pcm_format;
+       if (pcm_format_to_bits((__force snd_pcm_format_t)params->codec.pcm_format) & cap.fmt_out)
+               pair->sample_format[OUT] = (__force snd_pcm_format_t)params->codec.pcm_format;
        else
                return -EINVAL;
 
@@ -592,7 +592,7 @@ static int fsl_asrc_m2m_fill_codec_caps(struct fsl_asrc *asrc,
                               cap.rate_in,
                               cap.rate_in_count * sizeof(__u32));
                        codec->descriptor[j].num_sample_rates = cap.rate_in_count;
-                       codec->descriptor[j].formats = k;
+                       codec->descriptor[j].formats = (__force __u32)k;
                        codec->descriptor[j].pcm_formats = cap.fmt_out;
                        codec->descriptor[j].src.out_sample_rate_min = cap.rate_out[0];
                        codec->descriptor[j].src.out_sample_rate_max =