ASoC: mediatek: assign correct type to argument

Fix the following sparse warning: (new ones prefixed by >>)
>> sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c:370:33:
     sparse: sparse: incorrect type in argument 3 (different base types)
   sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c:370:33: sparse:
     expected unsigned int to
   sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c:370:33: sparse:
     got restricted snd_pcm_format_t [usertype]

Correct discription of format, use S32_LE and S24_LE to distinguish the
different 32bit.

Signed-off-by: Jiaxin Yu <jiaxin.yu@mediatek.com>
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20211209073224.21793-1-jiaxin.yu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index a4d26a6..f8a72a5 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -155,9 +155,9 @@ static const struct snd_soc_ops mt8183_da7219_rt1015_i2s_ops = {
 static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                      struct snd_pcm_hw_params *params)
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S32_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
-                            0, SNDRV_PCM_FORMAT_LAST);
+                            0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
        params_set_format(params, SNDRV_PCM_FORMAT_S32_LE);
 
@@ -167,9 +167,9 @@ static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
 static int mt8183_rt1015_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                             struct snd_pcm_hw_params *params)
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
-                            0, SNDRV_PCM_FORMAT_LAST);
+                            0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
        params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
 

diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
index aeb1af8..d5fc861 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
@@ -94,11 +94,11 @@ static const struct snd_soc_ops mt8183_mt6358_rt1015_i2s_ops = {
 static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                      struct snd_pcm_hw_params *params)
 {
-       dev_dbg(rtd->dev, "%s(), fix format to 32bit\n", __func__);
+       dev_dbg(rtd->dev, "%s(), fix format to S32_LE\n", __func__);
 
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S32_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
-                            0, SNDRV_PCM_FORMAT_LAST);
+                            0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
        params_set_format(params, SNDRV_PCM_FORMAT_S32_LE);
        return 0;
@@ -107,11 +107,11 @@ static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
 static int mt8183_rt1015_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                             struct snd_pcm_hw_params *params)
 {
-       dev_dbg(rtd->dev, "%s(), fix format to 32bit\n", __func__);
+       dev_dbg(rtd->dev, "%s(), fix format to S24_LE\n", __func__);
 
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
-                            0, SNDRV_PCM_FORMAT_LAST);
+                            0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
        params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
        return 0;

diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index a606133..1d16939 100644 (file)
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -350,9 +350,9 @@ static int mt8192_mt6359_hdmi_init(struct snd_soc_pcm_runtime *rtd)
 static int mt8192_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                      struct snd_pcm_hw_params *params)
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
-                            0, SNDRV_PCM_FORMAT_LAST);
+                            0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
        params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
 

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c
index cca1c73..5cdbfaa 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c
@@ -359,7 +359,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd)
 static int mt8195_etdm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                       struct snd_pcm_hw_params *params)
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
                             0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
@@ -464,7 +464,7 @@ static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                       struct snd_pcm_hw_params *params)
 
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
                             0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c
index 11a185d..fa50a31 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c
@@ -355,7 +355,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd)
 static int mt8195_etdm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                       struct snd_pcm_hw_params *params)
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
                             0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);
 
@@ -463,7 +463,7 @@ static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                       struct snd_pcm_hw_params *params)
 
 {
-       /* fix BE i2s format to 32bit, clean param mask first */
+       /* fix BE i2s format to S24_LE, clean param mask first */
        snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
                             0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST);