ASoC: intel: Fix snd_pcm_format_t handling

As sparse warns, the PCM format type can't be dealt as integer as
found in Intel SST driver codes.

Fix them in the following two ways:

- The open code with snd_mask_set() and params->masks reference is
  replaced with params_set_format()

- The rest codes with snd_mask_set(fmt, SNDRV_PCM_FORMAT_XXX) are
  replaced with the new helper, snd_mask_set_format().

Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index 6ea360f33575ae8520a6cd4dccca6fbd309ae801..efcfd906c8562b6dc13086ce18fc0e7f008705df 100644 (file)
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -154,9 +154,7 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
        channels->min = channels->max = 2;
 
        /* set SSP0 to 16 bit */
-       snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT -
-                                   SNDRV_PCM_HW_PARAM_FIRST_MASK],
-                                   SNDRV_PCM_FORMAT_S16_LE);
+       params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);
        return 0;
 }
 

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 3aba5bcf806aad4c428b05195cb2d48c3faffdfb..be6e4b40bf036b35071ba38fb2977f92f0cf8232 100644 (file)
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -160,7 +160,7 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index b68c289558a8d41a0d1b80dea4b4bd5bf41c176b..27308337ab127a22071369056d471d8c69b1ce81 100644 (file)
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -221,7 +221,7 @@ static int broxton_ssp5_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP5 to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
index 7961f1fd18bd9f21f4583645235b812f01b4109c..38f6ab74709d06df483a22639d1fc40c48b8e263 100644 (file)
--- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
@@ -152,7 +152,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index 3a61252fe450dec7af275f2076d906dafe019899..21a6490746a6f9ab4611d7fd2de6dd96fe6cb042 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -434,14 +434,14 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
                rate->min = rate->max = 48000;
                channels->min = channels->max = 2;
                snd_mask_none(fmt);
-               snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+               snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
        }
        /*
         * The speaker on the SSP0 supports S16_LE and not S24_LE.
         * thus changing the mask here
         */
        if (!strcmp(be_dai_link->name, "SSP0-Codec"))
-               snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+               snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 92f5fb2ae0a36bf9c75eedc02ca6724880103dd1..a892b37eab7c924bcf24a21fc2352c0fce13976a 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -307,7 +307,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
                rate->min = rate->max = 48000;
                channels->min = channels->max = 2;
                snd_mask_none(fmt);
-               snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+               snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
        } else if (!strcmp(fe_dai_link->name, "Kbl Audio DMIC cap")) {
                if (params_channels(params) == 2 ||
                                DMIC_CH(dmic_constraints) == 2)
@@ -320,7 +320,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
         * thus changing the mask here
         */
        if (!strcmp(be_dai_link->name, "SSP0-Codec"))
-               snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+               snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index 3ff6646cfa21a10347d4c0e3071dd369acf57da2..d31482b8c9bbb02a0dcbd6e1c74fe5e01db9f657 100644 (file)
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -157,7 +157,7 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP0 to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
 
        return 0;
 }

diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index b0610bba3cfab3bc65693c4b630d7f1101717e25..e877bb60beb10b3634efe82dcb5ae870e768b3a8 100644 (file)
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -346,7 +346,7 @@ static int skylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP0 to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
        return 0;
 }
 

diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 38a1495c29cfbb84bfdf9fdc3cc3a62a53c0cffe..0e1818dd4cc69fec726ae29ee97d9756bb925c06 100644 (file)
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -229,7 +229,7 @@ static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
 
        /* set SSP0 to 24 bit */
        snd_mask_none(fmt);
-       snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+       snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
        return 0;
 }