| Message ID | 20240417-sunxi_s32_fix-v1-1-d82e451565c0@jookia.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9be51470d514eb20d4ce29684cf933ef1c5fff48 |
| Headers | show |
| Series | ASoC: sunxi: sun4i-i2s: Fix pcm_formats type specification | expand |
Dne sreda, 17. april 2024 ob 07:14:43 GMT +2 je John Watts napisal(a): > pcm_formats should be a u64 as it is a SNDRV_PCM_FMTBIT_* not a > SNDRV_PCM_FORMAT_*. > > Also fix a small grammar error while we're here. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202404170103.ySYwieqi-lkp@intel.com/ > Signed-off-by: John Watts <contact@jookia.org> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > This is a quick fix for a type error found by the kernel test robot. > --- > sound/soc/sunxi/sun4i-i2s.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c > index 59830f2a0d30..5f8d979585b6 100644 > --- a/sound/soc/sunxi/sun4i-i2s.c > +++ b/sound/soc/sunxi/sun4i-i2s.c > @@ -156,7 +156,7 @@ struct sun4i_i2s; > /** > * struct sun4i_i2s_quirks - Differences between SoC variants. > * @has_reset: SoC needs reset deasserted. > - * @pcm_formats: available PCM formats > + * @pcm_formats: available PCM formats. > * @reg_offset_txdata: offset of the tx fifo. > * @sun4i_i2s_regmap: regmap config to use. > * @field_clkdiv_mclk_en: regmap field to enable mclk output. > @@ -176,7 +176,7 @@ struct sun4i_i2s; > */ > struct sun4i_i2s_quirks { > bool has_reset; > - snd_pcm_format_t pcm_formats; > + u64 pcm_formats; > unsigned int reg_offset_txdata; /* TX FIFO */ > const struct regmap_config *sun4i_i2s_regmap; > > > --- > base-commit: 66e4190e92ce0e4a50b2f6be0e5f5b2e47e072f4 > change-id: 20240417-sunxi_s32_fix-ef5354b40fb4 > > Best regards, >
On Wed, 17 Apr 2024 15:14:43 +1000, John Watts wrote: > pcm_formats should be a u64 as it is a SNDRV_PCM_FMTBIT_* not a > SNDRV_PCM_FORMAT_*. > > Also fix a small grammar error while we're here. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: sunxi: sun4i-i2s: Fix pcm_formats type specification commit: 9be51470d514eb20d4ce29684cf933ef1c5fff48 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
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 59830f2a0d30..5f8d979585b6 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -156,7 +156,7 @@ struct sun4i_i2s; /** * struct sun4i_i2s_quirks - Differences between SoC variants. * @has_reset: SoC needs reset deasserted. - * @pcm_formats: available PCM formats + * @pcm_formats: available PCM formats. * @reg_offset_txdata: offset of the tx fifo. * @sun4i_i2s_regmap: regmap config to use. * @field_clkdiv_mclk_en: regmap field to enable mclk output. @@ -176,7 +176,7 @@ struct sun4i_i2s; */ struct sun4i_i2s_quirks { bool has_reset; - snd_pcm_format_t pcm_formats; + u64 pcm_formats; unsigned int reg_offset_txdata; /* TX FIFO */ const struct regmap_config *sun4i_i2s_regmap;
pcm_formats should be a u64 as it is a SNDRV_PCM_FMTBIT_* not a SNDRV_PCM_FORMAT_*. Also fix a small grammar error while we're here. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202404170103.ySYwieqi-lkp@intel.com/ Signed-off-by: John Watts <contact@jookia.org> --- This is a quick fix for a type error found by the kernel test robot. --- sound/soc/sunxi/sun4i-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 66e4190e92ce0e4a50b2f6be0e5f5b2e47e072f4 change-id: 20240417-sunxi_s32_fix-ef5354b40fb4 Best regards,