[0/8] ASoC: cleasnup rtd and its ID

Message

Kuninori Morimoto Oct. 24, 2024, 1:28 a.m. UTC

Hi Mark

rtd has own ID, but it is naming "num" for it. The naming is confusable.
This patch rename it to "id".
And many functions request both "rtd" and its "id" as function parameter,
but rtd itself has rtd->id. This patch cleanup it.

And, Qcom driver want to use irregular rtd ID because of its topology,
and thus, soc-core need irregular calculation. I'm not sure why only Qcom
needs such calculation, but this patch also cleanup it.
But I guess we want to cleanup is not soc-core but Qcom side (?)

Kuninori Morimoto (8):
  ASoC: rename rtd->num to rtd->id
  ASoC: fsl: switch to use rtd->id from rtd->num
  ASoC: meson: switch to use rtd->id from rtd->num
  ASoC: sh: switch to use rtd->id from rtd->num
  ASoC: generic: switch to use rtd->id from rtd->num
  ASoC: remove rtd->num
  ASoC: soc-core: do rtd->id trick at snd_soc_add_pcm_runtime()
  ASoC: cleanup function parameter for rtd and its id

 include/sound/soc-dai.h               |  5 ++-
 include/sound/soc.h                   |  8 ++---
 sound/soc/fsl/imx-card.c              |  6 ++--
 sound/soc/generic/simple-card-utils.c | 10 +++---
 sound/soc/meson/axg-card.c            |  6 ++--
 sound/soc/meson/gx-card.c             |  2 +-
 sound/soc/sh/rcar/core.c              |  2 +-
 sound/soc/soc-compress.c              |  9 +++--
 sound/soc/soc-core.c                  | 50 +++++++++++++++------------
 sound/soc/soc-dai.c                   |  4 +--
 sound/soc/soc-pcm.c                   | 16 ++++-----
 11 files changed, 60 insertions(+), 58 deletions(-)

Comments

Mark Brown Nov. 5, 2024, 7:07 p.m. UTC | #1

On Thu, 24 Oct 2024 01:28:10 +0000, Kuninori Morimoto wrote:
> rtd has own ID, but it is naming "num" for it. The naming is confusable.
> This patch rename it to "id".
> And many functions request both "rtd" and its "id" as function parameter,
> but rtd itself has rtd->id. This patch cleanup it.
> 
> And, Qcom driver want to use irregular rtd ID because of its topology,
> and thus, soc-core need irregular calculation. I'm not sure why only Qcom
> needs such calculation, but this patch also cleanup it.
> But I guess we want to cleanup is not soc-core but Qcom side (?)
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/8] ASoC: rename rtd->num to rtd->id
      commit: 40e47e2db6864aa053a62477bd71a16be9dd4066
[2/8] ASoC: fsl: switch to use rtd->id from rtd->num
      commit: eae33f737c7a929d92b559fe1a1002d597b7b903
[3/8] ASoC: meson: switch to use rtd->id from rtd->num
      commit: b19f75df8fa9f8d4aa8b5886dca0f2d832a76baa
[4/8] ASoC: sh: switch to use rtd->id from rtd->num
      commit: 970a874b76d09d6a5880e8832e572850cfcb4008
[5/8] ASoC: generic: switch to use rtd->id from rtd->num
      commit: 742e622db67efc32affb5893fdcc0149f374533e
[6/8] ASoC: remove rtd->num
      commit: c59db5ed233a19f6aadd086fb89149ec5f6fa855
[7/8] ASoC: soc-core: do rtd->id trick at snd_soc_add_pcm_runtime()
      commit: cb18cd26039f5cdecb0ac53fb447b6f0859f3d1c
[8/8] ASoC: cleanup function parameter for rtd and its id
      commit: 8b12da9a18f4dd53e4b3a7393829a555e84f073c

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