| Message ID | 87wmy5b0wt.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ASoC: merge DAI call back functions into ops | expand |
On Tue, 08 Aug 2023 22:54:27 +0000, Kuninori Morimoto wrote: > v1 -> v2 > - add Reviewed-by on each patches. > - fixup git-log typo (thesse -> there) > - add missing patch for au1x > > Link: https://lore.kernel.org/r/87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [01/39] ASoC: soc-dai.h: merge DAI call back functions into ops commit: 3e8bcec0787d1a73703c915c31cb00a2fd18ccbf [02/39] ASoC: ti: merge DAI call back functions into ops commit: c64f5bd3afa0bf7a3b550bb63b9a5644acb04404 [03/39] ASoC: adi: merge DAI call back functions into ops commit: db49eb7b3855cc9bd422663b1cd84a36f5bd8d1f [04/39] ASoC: adi: merge DAI call back functions into ops commit: db49eb7b3855cc9bd422663b1cd84a36f5bd8d1f [05/39] ASoC: amd: merge DAI call back functions into ops commit: d86eb53532362f738dd840d7b953b2a769ccdd4b [06/39] ASoC: dwc: merge DAI call back functions into ops commit: 2c88ba731fec284af52ed19b6c6eaacffb0c50f0 [07/39] ASoC: pxa: merge DAI call back functions into ops commit: 208b8395f79e4ad9196849b744f6e4a7abd2b836 [08/39] ASoC: bcm: merge DAI call back functions into ops commit: 59cd0ba842771946e922291199ce8c7a662484d4 [09/39] ASoC: fsl: merge DAI call back functions into ops commit: 5e5f68ca836e740c1d788f04efa84b37ed185606 [10/39] ASoC: img: merge DAI call back functions into ops commit: a98bd9e1173872cdbfc3ca7a2c43382f1417ab7e [11/39] ASoC: sof: merge DAI call back functions into ops commit: f522af4cbe0158de3f518ed76b328ea6297a52b2 [12/39] ASoC: sti: merge DAI call back functions into ops commit: f33b8df2233a8f7007a289e4cf1bfce403fa6bf0 [13/39] ASoC: stm: merge DAI call back functions into ops commit: 2fb00b84cdb7dd2a8fe0d584236990b2392c5a57 [14/39] ASoC: pxa: merge DAI call back functions into ops commit: 208b8395f79e4ad9196849b744f6e4a7abd2b836 [15/39] ASoC: rsnd: merge DAI call back functions into ops commit: 47ca9f546ef6806925077e5ea6e084af660ee41b [16/39] ASoC: qcom: merge DAI call back functions into ops commit: 9174fd60e55d7ff1ad2c909c67de48ebe7008e5a [17/39] ASoC: au1x: merge DAI call back functions into ops commit: 4fc3331cb5f93b5a5ed5ee153b442960d11e1049 [18/39] ASoC: ux500: merge DAI call back functions into ops commit: 2870ffb31c58a301417ee12151122b337b316d0a [19/39] ASoC: sunxi: merge DAI call back functions into ops commit: 331cd4d326244d853eb2e9fd3dcf55969055187e [20/39] ASoC: tegra: merge DAI call back functions into ops commit: b36e672b6b6fa4f68fc74c3b85ba9b4a615fc1d9 [21/39] ASoC: atmel: merge DAI call back functions into ops commit: 2e85e70608c5d7233244c19ec2253dd1acb01e17 [22/39] ASoC: intel: merge DAI call back functions into ops commit: 3a8b7fd088d74c43eeb14406b7a1f0666a8d8594 [23/39] ASoC: meson: merge DAI call back functions into ops commit: 17821c2f6c53009b4c00aa5fd051425e19d46616 [24/39] ASoC: jz4740: merge DAI call back functions into ops commit: b3a7e76d7f7afd259dea954e9247dcccd361ed3a [25/39] ASoC: cirrus: merge DAI call back functions into ops commit: af8a0e0391308258b2338b3b72e8fad5fac2d5d7 [26/39] ASoC: drm/vc4: merge DAI call back functions into ops commit: 3964f1d944c9dba5444ed85a9fcdf69991f17e5c [27/39] ASoC: samsung: merge DAI call back functions into ops commit: 69b33471a2986f655006a37b1ae7b6cccf812b53 [28/39] ASoC: mediatek: merge DAI call back functions into ops commit: df775a399e1a6eb6eeab3d23f7c200f1dd4dcce0 [29/39] ASoC: rockchip: merge DAI call back functions into ops commit: 7575bec582876d295b34488cd39854c9e840ef04 [30/39] ASoC: uniphier: merge DAI call back functions into ops commit: 7142b49f5742d4bf5706b44db931906a45061b68 [31/39] ASoC: loongson: merge DAI call back functions into ops commit: 69c4f41b9e3c18bac11ada4b31abea3eed60f610 [32/39] ASoC: starfive: merge DAI call back functions into ops commit: de046f2ddbf929a0af73dd295902ea9a55ebc741 [33/39] ASoC: hisilicon: merge DAI call back functions into ops commit: d1f1c345562d31b1b5e2aaf03bfcdf1835778f65 [34/39] ASoC: codecs/wm*: merge DAI call back functions into ops commit: a350c5562318f798ef7b3e1e72bf947f0816ca45 [35/39] ASoC: soc-topology: merge DAI call back functions into ops commit: 7fdd0672678245dddd008fb2aea3b6952a5da795 [36/39] ASoC: codecs/cs47lxx: merge DAI call back functions into ops commit: 6bbb65c39a8468f12784bfa01d06a800c81310c5 [37/39] ASoC: codecs/cx2072x: merge DAI call back functions into ops commit: 707844f66ee3a79e3c1256e1b1667c9c43f6021d [38/39] ASoC: codecs/hdmi-codec: merge DAI call back functions into ops commit: acd3e6256edf6d81eb01ab9a6fcbc48bf038a9a6 [39/39] ASoC: soc-dai.h: remove unused call back functions commit: 8e1eb11cd4579decc8e928be2face7c43f2a9c67 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
Hi Mark snd_soc_dai_driver has .ops for call back functions (A), but it also has other call back functions (B). It is duplicated and confusable. struct snd_soc_dai_driver { ... ^ int (*probe)(...); | int (*remove)(...); (B) int (*compress_new)(...); | int (*pcm_new)(...); v ... (A) const struct snd_soc_dai_ops *ops; ... } This patch merges (B) into (A). -------- 8< -------- 8< -------- 8< -------- 8< -------- 8< -------- v1 -> v2 - add Reviewed-by on each patches. - fixup git-log typo (thesse -> there) - add missing patch for au1x Link: https://lore.kernel.org/r/87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (39): ASoC: soc-dai.h: merge DAI call back functions into ops ASoC: ti: merge DAI call back functions into ops ASoC: adi: merge DAI call back functions into ops ASoC: adi: merge DAI call back functions into ops ASoC: amd: merge DAI call back functions into ops ASoC: dwc: merge DAI call back functions into ops ASoC: pxa: merge DAI call back functions into ops ASoC: bcm: merge DAI call back functions into ops ASoC: fsl: merge DAI call back functions into ops ASoC: img: merge DAI call back functions into ops ASoC: sof: merge DAI call back functions into ops ASoC: sti: merge DAI call back functions into ops ASoC: stm: merge DAI call back functions into ops ASoC: pxa: merge DAI call back functions into ops ASoC: rsnd: merge DAI call back functions into ops ASoC: qcom: merge DAI call back functions into ops ASoC: au1x: merge DAI call back functions into ops ASoC: ux500: merge DAI call back functions into ops ASoC: sunxi: merge DAI call back functions into ops ASoC: tegra: merge DAI call back functions into ops ASoC: atmel: merge DAI call back functions into ops ASoC: intel: merge DAI call back functions into ops ASoC: meson: merge DAI call back functions into ops ASoC: jz4740: merge DAI call back functions into ops ASoC: cirrus: merge DAI call back functions into ops ASoC: drm/vc4: merge DAI call back functions into ops ASoC: samsung: merge DAI call back functions into ops ASoC: mediatek: merge DAI call back functions into ops ASoC: rockchip: merge DAI call back functions into ops ASoC: uniphier: merge DAI call back functions into ops ASoC: loongson: merge DAI call back functions into ops ASoC: starfive: merge DAI call back functions into ops ASoC: hisilicon: merge DAI call back functions into ops ASoC: codecs/wm*: merge DAI call back functions into ops ASoC: soc-topology: merge DAI call back functions into ops ASoC: codecs/cs47lxx: merge DAI call back functions into ops ASoC: codecs/cx2072x: merge DAI call back functions into ops ASoC: codecs/hdmi-codec: merge DAI call back functions into ops ASoC: soc-dai.h: remove unused call back functions drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +- include/sound/soc-dai.h | 26 +-- sound/soc/adi/axi-i2s.c | 2 +- sound/soc/adi/axi-spdif.c | 2 +- sound/soc/amd/acp/acp-i2s.c | 24 +-- sound/soc/amd/acp/acp-rembrandt.c | 3 - sound/soc/amd/acp/acp-renoir.c | 2 - sound/soc/amd/acp/amd.h | 1 - sound/soc/atmel/atmel-i2s.c | 16 +- sound/soc/atmel/mchp-i2s-mcc.c | 24 +-- sound/soc/atmel/mchp-pdmc.c | 18 +-- sound/soc/atmel/mchp-spdifrx.c | 14 +- sound/soc/atmel/mchp-spdiftx.c | 18 +-- sound/soc/au1x/ac97c.c | 10 +- sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/bcm/bcm2835-i2s.c | 24 +-- sound/soc/cirrus/ep93xx-i2s.c | 2 +- sound/soc/codecs/cs47l15.c | 6 +- sound/soc/codecs/cs47l24.c | 8 +- sound/soc/codecs/cs47l35.c | 8 +- sound/soc/codecs/cs47l85.c | 8 +- sound/soc/codecs/cs47l90.c | 8 +- sound/soc/codecs/cs47l92.c | 6 +- sound/soc/codecs/cx2072x.c | 11 +- sound/soc/codecs/hdmi-codec.c | 44 ++--- sound/soc/codecs/wm2200.c | 12 +- sound/soc/codecs/wm5102.c | 6 +- sound/soc/codecs/wm5110.c | 8 +- sound/soc/codecs/wm8994.c | 2 +- sound/soc/dwc/dwc-i2s.c | 18 +-- sound/soc/fsl/fsl_asrc.c | 16 +- sound/soc/fsl/fsl_aud2htx.c | 10 +- sound/soc/fsl/fsl_easrc.c | 16 +- sound/soc/fsl/fsl_esai.c | 20 +-- sound/soc/fsl/fsl_micfil.c | 14 +- sound/soc/fsl/fsl_sai.c | 24 +-- sound/soc/fsl/fsl_spdif.c | 17 +- sound/soc/fsl/fsl_ssi.c | 3 +- sound/soc/fsl/fsl_xcvr.c | 16 +- sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/hisilicon/hi6210-i2s.c | 2 +- sound/soc/img/img-i2s-in.c | 14 +- sound/soc/img/img-i2s-out.c | 14 +- sound/soc/img/img-parallel-out.c | 14 +- sound/soc/img/img-spdif-in.c | 12 +- sound/soc/img/img-spdif-out.c | 12 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/intel/avs/probes.c | 10 +- sound/soc/intel/catpt/pcm.c | 8 +- sound/soc/intel/keembay/kmb_platform.c | 4 +- sound/soc/jz4740/jz4740-i2s.c | 3 +- sound/soc/loongson/loongson_i2s.c | 16 +- sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 56 ++++--- sound/soc/meson/aiu-acodec-ctrl.c | 4 +- sound/soc/meson/aiu-codec-ctrl.c | 4 +- sound/soc/meson/aiu-fifo-i2s.c | 3 + sound/soc/meson/aiu-fifo-spdif.c | 3 + sound/soc/meson/aiu.c | 6 - sound/soc/meson/axg-frddr.c | 4 +- sound/soc/meson/axg-pdm.c | 18 +-- sound/soc/meson/axg-spdifin.c | 4 +- sound/soc/meson/axg-tdm-interface.c | 6 +- sound/soc/meson/axg-toddr.c | 4 +- sound/soc/meson/g12a-toacodec.c | 4 +- sound/soc/meson/g12a-tohdmitx.c | 4 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/pxa-ssp.c | 4 +- sound/soc/qcom/lpass-apq8016.c | 4 - sound/soc/qcom/lpass-cpu.c | 40 +++-- sound/soc/qcom/lpass-ipq806x.c | 1 - sound/soc/qcom/lpass-sc7180.c | 5 +- sound/soc/qcom/lpass-sc7280.c | 2 - sound/soc/qcom/lpass.h | 4 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 88 +++++----- sound/soc/qcom/qdsp6/q6asm-dai.c | 6 +- sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 3 - sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- sound/soc/rockchip/rockchip_pdm.c | 2 +- sound/soc/rockchip/rockchip_spdif.c | 2 +- sound/soc/samsung/i2s.c | 5 +- sound/soc/samsung/pcm.c | 18 +-- sound/soc/sh/rcar/core.c | 27 ++-- sound/soc/soc-dai.c | 44 ++--- sound/soc/soc-topology.c | 6 +- sound/soc/sof/sof-client-probes.c | 6 +- sound/soc/starfive/jh7110_tdm.c | 16 +- sound/soc/sti/sti_uniperif.c | 6 +- sound/soc/stm/stm32_i2s.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 18 ++- sound/soc/stm/stm32_spdifrx.c | 2 +- sound/soc/sunxi/sun4i-codec.c | 6 +- sound/soc/sunxi/sun4i-i2s.c | 18 +-- sound/soc/sunxi/sun4i-spdif.c | 2 +- sound/soc/sunxi/sun50i-dmic.c | 2 +- sound/soc/tegra/tegra20_ac97.c | 10 +- sound/soc/tegra/tegra20_i2s.c | 2 +- sound/soc/tegra/tegra20_spdif.c | 2 +- sound/soc/tegra/tegra210_admaif.c | 12 +- sound/soc/tegra/tegra30_i2s.c | 2 +- sound/soc/ti/davinci-i2s.c | 22 +-- sound/soc/ti/davinci-mcasp.c | 27 ++-- sound/soc/ti/omap-dmic.c | 22 +-- sound/soc/ti/omap-mcbsp.c | 28 ++-- sound/soc/ti/omap-mcpdm.c | 22 +-- sound/soc/uniphier/aio-cpu.c | 161 +++++++++++++++---- sound/soc/uniphier/aio-ld11.c | 62 ++----- sound/soc/uniphier/aio-pxs2.c | 55 +------ sound/soc/uniphier/aio.h | 10 +- sound/soc/ux500/ux500_msp_dai.c | 2 +- 110 files changed, 798 insertions(+), 694 deletions(-)