| Message ID | 20220922153752.336193-1-nathan@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0402cca4828dd9556d36ddef67710993b7063f7c |
| Headers | show |
| Series | [-next] ASoC: Intel: sof_da7219_mx98360a: Access num_codecs through dai_link | expand |
On 9/22/22 17:37, Nathan Chancellor wrote: > After commit 3989ade2d1e7 ("ASoC: soc.h: remove num_cpus/codecs"), the > following build error occurs: > > sound/soc/intel/boards/sof_da7219_max98373.c:198:27: error: no member named 'num_codecs' in 'struct snd_soc_pcm_runtime' > for (j = 0; j < runtime->num_codecs; j++) { > ~~~~~~~ ^ > 1 error generated. > > This conversion was missed by the aforementioned change. Do it now to > fix the build error. > > Fixes: 3989ade2d1e7 ("ASoC: soc.h: remove num_cpus/codecs") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c > index 34cf849a8344..e048e789e633 100644 > --- a/sound/soc/intel/boards/sof_da7219_max98373.c > +++ b/sound/soc/intel/boards/sof_da7219_max98373.c > @@ -195,7 +195,7 @@ static int ssp1_hw_params(struct snd_pcm_substream *substream, > struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); > int ret, j; > > - for (j = 0; j < runtime->num_codecs; j++) { > + for (j = 0; j < runtime->dai_link->num_codecs; j++) { > struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, j); > > if (!strcmp(codec_dai->component->name, MAXIM_DEV0_NAME)) { > > base-commit: a921986f445ad611b441c8ee7749dc6dfc770481
On Thu, 22 Sep 2022 08:37:52 -0700, Nathan Chancellor wrote: > After commit 3989ade2d1e7 ("ASoC: soc.h: remove num_cpus/codecs"), the > following build error occurs: > > sound/soc/intel/boards/sof_da7219_max98373.c:198:27: error: no member named 'num_codecs' in 'struct snd_soc_pcm_runtime' > for (j = 0; j < runtime->num_codecs; j++) { > ~~~~~~~ ^ > 1 error generated. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: sof_da7219_mx98360a: Access num_codecs through dai_link commit: 0402cca4828dd9556d36ddef67710993b7063f7c 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/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c index 34cf849a8344..e048e789e633 100644 --- a/sound/soc/intel/boards/sof_da7219_max98373.c +++ b/sound/soc/intel/boards/sof_da7219_max98373.c @@ -195,7 +195,7 @@ static int ssp1_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); int ret, j; - for (j = 0; j < runtime->num_codecs; j++) { + for (j = 0; j < runtime->dai_link->num_codecs; j++) { struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, j); if (!strcmp(codec_dai->component->name, MAXIM_DEV0_NAME)) {
After commit 3989ade2d1e7 ("ASoC: soc.h: remove num_cpus/codecs"), the following build error occurs: sound/soc/intel/boards/sof_da7219_max98373.c:198:27: error: no member named 'num_codecs' in 'struct snd_soc_pcm_runtime' for (j = 0; j < runtime->num_codecs; j++) { ~~~~~~~ ^ 1 error generated. This conversion was missed by the aforementioned change. Do it now to fix the build error. Fixes: 3989ade2d1e7 ("ASoC: soc.h: remove num_cpus/codecs") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- sound/soc/intel/boards/sof_da7219_max98373.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: a921986f445ad611b441c8ee7749dc6dfc770481