ASoC: PCM format type conversion fixes
Subsystems (7)
cover ASoC: PCM format type conversion fixes
Hi,
the PCM format is a fixed type with __bitwise, and it needs cast or other trick to deal with integer. This is a series of such fixes for ASoC.
Takashi
===
Takashi Iwai (6):
ALSA: pcm: Add snd_mask_set_format() helper for standard usages
ASoC: doc: Replace open code with params_set_format()
ASoC: intel: Fix snd_pcm_format_t handling
ASoC: fsl: Use snd_mask_set_format()
ASoC: pcm186x: Declare PCM format with snd_pcm_format_t
ASoC: dmaengine: Use standard pcm_format_to_bits() macro
Documentation/sound/soc/dpcm.rst | 4 +--- include/sound/pcm_params.h | 10 ++++++++-- sound/soc/codecs/pcm186x.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/intel/boards/bdw-rt5677.c | 4 +--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 ++-- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 ++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 14 files changed, 23 insertions(+), 21 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/6 ALSA: pcm: Add snd_mask_set_format() helper for standard usages
Many drivers calling snd_mask_set() need to do ugly cast with __force for shutting up the sparse warnings. Actually almost all of them are about setting the format, so it's far better to provide a common helper snd_mask_set_format() to pass SNDRV_PCM_FORMAT_* directly without the cast.
There are a few other calls of snd_mask_set(), but they are in the PCM core code, so we leave them for now.
--- include/sound/pcm_params.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
include/sound/pcm_params.h +8 -2
@@ -87,6 +87,13 @@ static inline void snd_mask_set(struct snd_mask *mask, unsigned int val) mask->bits[MASK_OFS (val)] |=MASK_BIT (val); } +/* Most of drivers need only this one */ +static inline void snd_mask_set_format (struct snd_mask *mask, +snd_pcm_format_t format) +{ +snd_mask_set (mask, (__force unsigned int )format); +} +static inline void snd_mask_reset (struct snd_mask *mask,unsigned int val) { mask->bits[MASK_OFS (val)] &= ~MASK_BIT (val);
@@ -369,8 +376,7 @@ static inline int params_physical_width(const struct snd_pcm_hw_params *p)static inline void params_set_format (struct snd_pcm_hw_params *p,snd_pcm_format_t fmt) { -snd_mask_set (hw_param_mask (p,SNDRV_PCM_HW_PARAM_FORMAT ), - (__force int )fmt); +snd_mask_set_format (hw_param_mask (p,SNDRV_PCM_HW_PARAM_FORMAT ), fmt); }#endif /* __SOUND_PCM_PARAMS_H */
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ALSA: pcm: Add snd_mask_set_format() helper for standard usages" to the asoc tree
The patch
ALSA: pcm: Add snd_mask_set_format() helper for standard usages
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
0b62834e73e332fea76a340d62aaf50c732b17e0Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:17 +0200
Subject: [PATCH] ALSA: pcm: Add snd_mask_set_format() helper for standard
usages
Many drivers calling snd_mask_set() need to do ugly cast with __force for shutting up the sparse warnings. Actually almost all of them are about setting the format, so it's far better to provide a common helper snd_mask_set_format() to pass SNDRV_PCM_FORMAT_* directly without the cast.
There are a few other calls of snd_mask_set(), but they are in the PCM core code, so we leave them for now.
--- include/sound/pcm_params.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
include/sound/pcm_params.h +8 -2
@@ -87,6 +87,13 @@ static inline void snd_mask_set(struct snd_mask *mask, unsigned int val) mask->bits[MASK_OFS (val)] |=MASK_BIT (val); } +/* Most of drivers need only this one */ +static inline void snd_mask_set_format (struct snd_mask *mask, +snd_pcm_format_t format) +{ +snd_mask_set (mask, (__force unsigned int )format); +} +static inline void snd_mask_reset (struct snd_mask *mask,unsigned int val) { mask->bits[MASK_OFS (val)] &= ~MASK_BIT (val);
@@ -369,8 +376,7 @@ static inline int params_physical_width(const struct snd_pcm_hw_params *p)static inline void params_set_format (struct snd_pcm_hw_params *p,snd_pcm_format_t fmt) { -snd_mask_set (hw_param_mask (p,SNDRV_PCM_HW_PARAM_FORMAT ), - (__force int )fmt); +snd_mask_set_format (hw_param_mask (p,SNDRV_PCM_HW_PARAM_FORMAT ), fmt); }#endif /* __SOUND_PCM_PARAMS_H */
Signature · 1 line
2.18.0
PATCH 2/6 ASoC: doc: Replace open code with params_set_format()
In reply to Takashi IwaiThe example code in dpcm.rst contains an open code calling snd_mask_set(), and this can be better represented with params_set_format() instead. This automatically fixes the sparse warning about snd_pcm_format_t handling, too.
--- Documentation/sound/soc/dpcm.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Documentation/sound/soc/dpcm.rst +1 -3
@@ -254,9 +254,7 @@ configuration. channels->min = channels->max = 2; /* set DAI0 to 16 bit */ - snd_mask_set(¶ms->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; }
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ASoC: doc: Replace open code with params_set_format()" to the asoc tree
The patch
ASoC: doc: Replace open code with params_set_format()
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
533a9274850b041b32fbe6d1df58a5c5b0b9e652Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:18 +0200
Subject: [PATCH] ASoC: doc: Replace open code with params_set_format()
The example code in dpcm.rst contains an open code calling snd_mask_set(), and this can be better represented with params_set_format() instead. This automatically fixes the sparse warning about snd_pcm_format_t handling, too.
--- Documentation/sound/soc/dpcm.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Documentation/sound/soc/dpcm.rst +1 -3
@@ -254,9 +254,7 @@ configuration. channels->min = channels->max = 2; /* set DAI0 to 16 bit */ - snd_mask_set(¶ms->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; }
Signature · 1 line
2.18.0
PATCH 3/6 ASoC: intel: Fix snd_pcm_format_t handling
In reply to Takashi IwaiAs 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().
--- sound/soc/intel/boards/bdw-rt5677.c | 4 +--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 ++-- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 ++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-)
sound/soc/intel/boards/bdw-rt5677.c +1 -3
@@ -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 (¶ms->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 ; }
sound/soc/intel/boards/bxt_da7219_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/bxt_rt298.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/kbl_da7219_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/kbl_rt5663_max98927.c +2 -2
@@ -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 ; }
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +2 -2
@@ -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 ; }
sound/soc/intel/boards/skl_nau88l25_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/skl_rt286.c +1 -1
@@ -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 ; }
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ASoC: intel: Fix snd_pcm_format_t handling" to the asoc tree
The patch
ASoC: intel: Fix snd_pcm_format_t handling
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b5453e8ca311fdb6003c6583ad101d2b9131b994Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:19 +0200
Subject: [PATCH] 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().
--- sound/soc/intel/boards/bdw-rt5677.c | 4 +--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 ++-- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 ++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-)
sound/soc/intel/boards/bdw-rt5677.c +1 -3
@@ -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 (¶ms->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 ; }
sound/soc/intel/boards/bxt_da7219_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/bxt_rt298.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/kbl_da7219_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/kbl_rt5663_max98927.c +2 -2
@@ -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 ; }
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +2 -2
@@ -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 ; }
sound/soc/intel/boards/skl_nau88l25_max98357a.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/skl_nau88l25_ssm4567.c +1 -1
@@ -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 ; }
sound/soc/intel/boards/skl_rt286.c +1 -1
@@ -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 ; }
Signature · 1 line
2.18.0
PATCH 4/6 ASoC: fsl: Use snd_mask_set_format()
In reply to Takashi IwaiUse the new helper function snd_mask_set_format() for avoiding the ugly cast with __force prefix.
--- sound/soc/fsl/fsl-asoc-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/fsl-asoc-card.c +1 -1
@@ -199,7 +199,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, (__force int )priv->asrc_format); +snd_mask_set_format (mask, priv->asrc_format);return 0 ; }
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ASoC: fsl: Use snd_mask_set_format()" to the asoc tree
The patch
ASoC: fsl: Use snd_mask_set_format()
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
ebc22af0c9268dc4032326c20b02f2f227203330Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:20 +0200
Subject: [PATCH] ASoC: fsl: Use snd_mask_set_format()
Use the new helper function snd_mask_set_format() for avoiding the ugly cast with __force prefix.
--- sound/soc/fsl/fsl-asoc-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/fsl-asoc-card.c +1 -1
@@ -195,7 +195,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, (__force int )priv->asrc_format); +snd_mask_set_format (mask, priv->asrc_format);return 0 ; }
Signature · 1 line
2.18.0
PATCH 5/6 ASoC: pcm186x: Declare PCM format with snd_pcm_format_t
In reply to Takashi IwaiThe PCM format type is with __bitwise, so we should use the dedicated snd_pcm_format_t instead of int.
This fixes the sparse warning like:
sound/soc/codecs/pcm186x.c:268:44: warning: incorrect type in initializer (different base types)
--- sound/soc/codecs/pcm186x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/pcm186x.c +1 -1
@@ -265,7 +265,7 @@ static int pcm186x_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct pcm186x_priv *priv =snd_soc_component_get_drvdata (component);unsigned int rate =params_rate (params); -unsigned int format =params_format (params); +snd_pcm_format_t format =params_format (params);unsigned int width =params_width (params);unsigned int channels =params_channels (params);unsigned int div_lrck;
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ASoC: pcm186x: Declare PCM format with snd_pcm_format_t" to the asoc tree
The patch
ASoC: pcm186x: Declare PCM format with snd_pcm_format_t
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
79b8a50813a80ac15fdcdc96674098dee15eaaf5Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:21 +0200
Subject: [PATCH] ASoC: pcm186x: Declare PCM format with snd_pcm_format_t
The PCM format type is with __bitwise, so we should use the dedicated snd_pcm_format_t instead of int.
This fixes the sparse warning like:
sound/soc/codecs/pcm186x.c:268:44: warning: incorrect type in initializer (different base types)
--- sound/soc/codecs/pcm186x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/pcm186x.c +1 -1
@@ -265,7 +265,7 @@ static int pcm186x_hw_params(struct snd_pcm_substream *substream,struct snd_soc_component *component = dai->component;struct pcm186x_priv *priv =snd_soc_component_get_drvdata (component);unsigned int rate =params_rate (params); -unsigned int format =params_format (params); +snd_pcm_format_t format =params_format (params);unsigned int width =params_width (params);unsigned int channels =params_channels (params);unsigned int div_lrck;
Signature · 1 line
2.18.0
PATCH 6/6 ASoC: dmaengine: Use standard pcm_format_to_bits() macro
In reply to Takashi IwaiThe conversion from PCM format type to bits needs an explicit cast, and it'll be uglier. Since we have a standard macro for that, let's use it instead.
This patch fixes the sparse warning:
sound/soc/soc-generic-dmaengine-pcm.c:200:63: warning: restricted snd_pcm_format_t degrades to integer
--- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-generic-dmaengine-pcm.c +1 -1
@@ -197,7 +197,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substreacase 32 :case 64 :if (addr_widths & (1 << (bits /8 ))) - hw.formats |= (1LL << i); + hw.formats |=pcm_format_to_bits (i);break ;default :/* Unsupported types */
Signature · 1 line
2.18.0
Mark Brown
maintainerApplied "ASoC: dmaengine: Use standard pcm_format_to_bits() macro" to the asoc tree
The patch
ASoC: dmaengine: Use standard pcm_format_to_bits() macro
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8adf3df4156345f1edcdfa8c7f7beeb0de351ce2Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 25 Jul 2018 23:17:22 +0200
Subject: [PATCH] ASoC: dmaengine: Use standard pcm_format_to_bits() macro
The conversion from PCM format type to bits needs an explicit cast, and it'll be uglier. Since we have a standard macro for that, let's use it instead.
This patch fixes the sparse warning:
sound/soc/soc-generic-dmaengine-pcm.c:200:63: warning: restricted snd_pcm_format_t degrades to integer
--- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-generic-dmaengine-pcm.c +1 -1
@@ -188,7 +188,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substreacase 32 :case 64 :if (addr_widths & (1 << (bits /8 ))) - hw.formats |= (1LL << i); + hw.formats |=pcm_format_to_bits (i);break ;default :/* Unsupported types */
Signature · 1 line
2.18.0
Mark Brown
maintainerQuoted 5 lines · Takashi Iwai
Hi,
the PCM format is a fixed type with
__bitwise, and it needs cast or other trick to deal with integer. This is a series of such fixes for ASoC.
Nice! Should I just apply all these (including the initial patch adding the helper)?
Quoted 10 lines · Mark Brown
Quoted 5 lines · Takashi Iwai
Hi,
the PCM format is a fixed type with
__bitwise, and it needs cast or other trick to deal with integer. This is a series of such fixes for ASoC.Nice! Should I just apply all these (including the initial patch adding the helper)?
Yes, please.
Takashi