Commit 8bb5b59d authored Oct 03, 2020 by Coiby Xu Committed by Greg Kroah-Hartman Oct 05, 2020

staging: greybus: codecs: use SNDRV_PCM_FMTBIT_S16_LE for format bitmask



snd_soc_pcm_stream.formats should use the bitmask SNDRV_PCM_FMTBIT_*
instead of the sequential integers SNDRV_PCM_FORMAT_* as explained by
commit e712bfca
("ASoC: codecs: use SNDRV_PCM_FMTBIT_* for format bitmask").

Found by sparse,

$ make C=2 drivers/staging/greybus/
drivers/staging/greybus/audio_codec.c:691:36: warning: incorrect type in initializer (different base types)
drivers/staging/greybus/audio_codec.c:691:36:    expected unsigned long long [usertype] formats
drivers/staging/greybus/audio_codec.c:691:36:    got restricted snd_pcm_format_t [usertype]
drivers/staging/greybus/audio_codec.c:701:36: warning: incorrect type in initializer (different base types)
drivers/staging/greybus/audio_codec.c:701:36:    expected unsigned long long [usertype] formats
drivers/staging/greybus/audio_codec.c:701:36:    got restricted snd_pcm_format_t [usertype]

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
Link: https://lore.kernel.org/r/20201002233057.74462-2-coiby.xu@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 50a390ad

drivers/staging/greybus/audio_codec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -688,7 +688,7 @@ static struct snd_soc_dai_driver gbaudio_dai[] = {
		.playback = {
		.stream_name = "I2S 0 Playback",
		.rates = SNDRV_PCM_RATE_48000,
		.formats = SNDRV_PCM_FORMAT_S16_LE,
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		.rate_max = 48000,
		.rate_min = 48000,
		.channels_min = 1,
		@@ -698,7 +698,7 @@ static struct snd_soc_dai_driver gbaudio_dai[] = {
		.capture = {
		.stream_name = "I2S 0 Capture",
		.rates = SNDRV_PCM_RATE_48000,
		.formats = SNDRV_PCM_FORMAT_S16_LE,
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		.rate_max = 48000,
		.rate_min = 48000,
		.channels_min = 1,

Admin message