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).
Kuninori Morimoto (38):
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: 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/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 +-
108 files changed, 792 insertions(+), 688 deletions(-)
--
2.25.1
