| Message ID | 20231019144108.42853-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7618ab524935667699afed76fb83bc9bb38710ec |
| Headers | show |
| Series | ASoC: codecs: wcd938x: use defines for entries in snd_soc_dai_driver array | expand |
On Thu, 19 Oct 2023 16:41:08 +0200, Krzysztof Kozlowski wrote: > snd_soc_dai_driver array in wcd938x driver has two entries whose order > must match order of wcd938x->sdw_priv array. The wcd938x_bind() and > wcd938x_codec_set_sdw_stream() rely on this order. wcd938x->sdw_priv > array is indexed by enum with AIF1_PB and AIF1_CAP, so use the same > defines instead of raw numners for snd_soc_dai_driver array. > No functional impact. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: codecs: wcd938x: use defines for entries in snd_soc_dai_driver array commit: 7618ab524935667699afed76fb83bc9bb38710ec 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/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index a3c680661377..a162bd46ba3e 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3392,7 +3392,7 @@ static const struct snd_soc_dai_ops wcd938x_sdw_dai_ops = { }; static struct snd_soc_dai_driver wcd938x_dais[] = { - [0] = { + [AIF1_PB] = { .name = "wcd938x-sdw-rx", .playback = { .stream_name = "WCD AIF1 Playback", @@ -3405,7 +3405,7 @@ static struct snd_soc_dai_driver wcd938x_dais[] = { }, .ops = &wcd938x_sdw_dai_ops, }, - [1] = { + [AIF1_CAP] = { .name = "wcd938x-sdw-tx", .capture = { .stream_name = "WCD AIF1 Capture",
snd_soc_dai_driver array in wcd938x driver has two entries whose order must match order of wcd938x->sdw_priv array. The wcd938x_bind() and wcd938x_codec_set_sdw_stream() rely on this order. wcd938x->sdw_priv array is indexed by enum with AIF1_PB and AIF1_CAP, so use the same defines instead of raw numners for snd_soc_dai_driver array. No functional impact. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- sound/soc/codecs/wcd938x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)