Hi Mark ASoC is using 2 type of prefix (asoc_xxx() vs snd_soc_xxx()), but there is no particular reason about that [1]. To reduce confusing, standarding these to snd_soc_xxx() is sensible. This patch adds asoc_xxx() macro to keep compatible for a while. It will be removed if all drivers were switched to new style. Link: https://lore.kernel.org/r/87h6td3hus.wl-kuninori.morimoto.gx@xxxxxxxxxxx [1] Kuninori Morimoto (54): ASoC: soc.h: convert asoc_xxx() to snd_soc_xxx() ASoC: simple_card_utils.h: convert not to use asoc_xxx() ASoC: sh: convert not to use asoc_xxx() ASoC: ti: convert not to use asoc_xxx() ASoC: arm: convert not to use asoc_xxx() ASoC: amd: convert not to use asoc_xxx() ASoC: bcm: convert not to use asoc_xxx() ASoC: dwc: convert not to use asoc_xxx() ASoC: fsl: convert not to use asoc_xxx() ASoC: img: convert not to use asoc_xxx() ASoC: mxs: convert not to use asoc_xxx() ASoC: pxa: convert not to use asoc_xxx() ASoC: stm: convert not to use asoc_xxx() ASoC: au1x: convert not to use asoc_xxx() ASoC: qcom: convert not to use asoc_xxx() ASoC: sprd: convert not to use asoc_xxx() ASoC: apple: convert not to use asoc_xxx() ASoC: atmel: convert not to use asoc_xxx() ASoC: meson: convert not to use asoc_xxx() ASoC: sunxi: convert not to use asoc_xxx() ASoC: tegra: convert not to use asoc_xxx() ASoC: ux500: convert not to use asoc_xxx() ASoC: google: convert not to use asoc_xxx() ASoC: cirrus: convert not to use asoc_xxx() ASoC: generic: convert not to use asoc_xxx() ASoC: samsung: convert not to use asoc_xxx() ASoC: extensa: convert not to use asoc_xxx() ASoC: kirkwood: convert not to use asoc_xxx() ASoC: loongson: convert not to use asoc_xxx() ASoC: mediatek: convert not to use asoc_xxx() ASoC: rockchip: convert not to use asoc_xxx() ASoC: starfive: convert not to use asoc_xxx() ASoC: uniphier: convert not to use asoc_xxx() ASoC: soundwire: convert not to use asoc_xxx() ASoC: intel: convert not to use asoc_xxx() ASoC: intel: avs: convert not to use asoc_xxx() ASoC: codec: wm: convert not to use asoc_xxx() ASoC: codec: rt5677: convert not to use asoc_xxx() ASoC: codec: cs47lxx: convert not to use asoc_xxx() ASoC: sof: convert not to use asoc_xxx() ASoC: sof: amd: convert not to use asoc_xxx() ASoC: sof: intel: convert not to use asoc_xxx() ASoC: sof: mediatek: convert not to use asoc_xxx() ASoC: soc-dai: convert not to use asoc_xxx() ASoC: soc-pcm: convert not to use asoc_xxx() ASoC: soc-core: convert not to use asoc_xxx() ASoC: soc-dapm: convert not to use asoc_xxx() ASoC: soc-link: convert not to use asoc_xxx() ASoC: soc-utils: convert not to use asoc_xxx() ASoC: soc-topology: convert not to use asoc_xxx() ASoC: soc-compress: convert not to use asoc_xxx() ASoC: soc-component: convert not to use asoc_xxx() ASoC: soc-generic-dmaengine-pcm: convert not to use asoc_xxx() ASoC: remove asoc_xxx() compatible macro drivers/soundwire/intel.c | 2 +- drivers/soundwire/intel_ace2x.c | 2 +- drivers/soundwire/stream.c | 2 +- include/sound/graph_card.h | 16 +- include/sound/simple_card.h | 6 +- include/sound/simple_card_utils.h | 106 ++++----- include/sound/soc-card.h | 4 +- include/sound/soc.h | 29 +-- sound/arm/pxa2xx-pcm-lib.c | 8 +- sound/soc/amd/acp-da7219-max98357a.c | 28 +-- sound/soc/amd/acp-es8336.c | 6 +- sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/acp-rt5645.c | 6 +- sound/soc/amd/acp/acp-legacy-common.c | 8 +- sound/soc/amd/acp/acp-mach-common.c | 54 ++--- sound/soc/amd/acp3x-rt5682-max9836.c | 12 +- sound/soc/amd/ps/ps-sdw-dma.c | 2 +- sound/soc/amd/raven/acp3x-i2s.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- sound/soc/amd/vangogh/acp5x-i2s.c | 2 +- sound/soc/amd/vangogh/acp5x-mach.c | 12 +- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 6 +- sound/soc/apple/mca.c | 26 +-- sound/soc/atmel/atmel-classd.c | 10 +- sound/soc/atmel/atmel-pcm-dma.c | 8 +- sound/soc/atmel/atmel-pcm-pdc.c | 4 +- sound/soc/atmel/atmel-pdmic.c | 12 +- sound/soc/atmel/atmel_wm8904.c | 4 +- sound/soc/atmel/mikroe-proto.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/atmel/sam9x5_wm8731.c | 2 +- sound/soc/au1x/db1200.c | 4 +- sound/soc/au1x/dbdma2.c | 4 +- sound/soc/au1x/dma.c | 4 +- sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/bcm/bcm63xx-pcm-whistler.c | 28 +-- sound/soc/bcm/cygnus-pcm.c | 24 +- sound/soc/cirrus/edb93xx.c | 6 +- sound/soc/codecs/cs47l15.c | 4 +- sound/soc/codecs/cs47l24.c | 6 +- sound/soc/codecs/cs47l35.c | 6 +- sound/soc/codecs/cs47l85.c | 6 +- sound/soc/codecs/cs47l90.c | 6 +- sound/soc/codecs/cs47l92.c | 4 +- sound/soc/codecs/rt5677-spi.c | 4 +- sound/soc/codecs/wm5110.c | 6 +- sound/soc/codecs/wm_adsp.c | 10 +- sound/soc/dwc/dwc-i2s.c | 2 +- sound/soc/dwc/dwc-pcm.c | 4 +- sound/soc/fsl/eukrea-tlv320.c | 6 +- sound/soc/fsl/fsl-asoc-card.c | 28 +-- sound/soc/fsl/fsl_asrc_dma.c | 10 +- sound/soc/fsl/fsl_dma.c | 2 +- sound/soc/fsl/fsl_spdif.c | 20 +- sound/soc/fsl/fsl_ssi.c | 16 +- sound/soc/fsl/imx-audmix.c | 18 +- sound/soc/fsl/imx-card.c | 6 +- sound/soc/fsl/imx-hdmi.c | 4 +- sound/soc/fsl/imx-pcm-rpmsg.c | 14 +- sound/soc/fsl/imx-rpmsg.c | 4 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-spdif.c | 2 +- sound/soc/fsl/mpc5200_dma.c | 18 +- sound/soc/fsl/mpc5200_psc_i2s.c | 4 +- sound/soc/fsl/mpc8610_hpcd.c | 6 +- sound/soc/fsl/p1022_ds.c | 6 +- sound/soc/fsl/p1022_rdk.c | 6 +- sound/soc/generic/audio-graph-card.c | 114 ++++----- .../generic/audio-graph-card2-custom-sample.c | 32 +-- sound/soc/generic/audio-graph-card2.c | 108 ++++----- sound/soc/generic/simple-card-utils.c | 219 +++++++++--------- sound/soc/generic/simple-card.c | 147 ++++++------ sound/soc/generic/test-component.c | 2 +- sound/soc/google/chv3-i2s.c | 22 +- sound/soc/img/img-i2s-in.c | 2 +- sound/soc/img/img-i2s-out.c | 2 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 +- sound/soc/intel/avs/boards/da7219.c | 4 +- sound/soc/intel/avs/boards/es8336.c | 8 +- sound/soc/intel/avs/boards/i2s_test.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 +- sound/soc/intel/avs/boards/max98927.c | 2 +- sound/soc/intel/avs/boards/nau8825.c | 8 +- sound/soc/intel/avs/boards/rt274.c | 4 +- sound/soc/intel/avs/boards/rt286.c | 8 +- sound/soc/intel/avs/boards/rt298.c | 8 +- sound/soc/intel/avs/boards/rt5663.c | 8 +- sound/soc/intel/avs/boards/rt5682.c | 8 +- sound/soc/intel/avs/boards/ssm4567.c | 4 +- sound/soc/intel/avs/pcm.c | 44 ++-- sound/soc/intel/boards/bdw-rt5650.c | 6 +- sound/soc/intel/boards/bdw-rt5677.c | 10 +- sound/soc/intel/boards/bdw_rt286.c | 8 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 8 +- sound/soc/intel/boards/bxt_rt298.c | 10 +- sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- sound/soc/intel/boards/bytcht_da7213.c | 12 +- sound/soc/intel/boards/bytcht_es8316.c | 8 +- sound/soc/intel/boards/bytcht_nocodec.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 +- sound/soc/intel/boards/bytcr_rt5651.c | 10 +- sound/soc/intel/boards/bytcr_wm5102.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 8 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 16 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 10 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 12 +- sound/soc/intel/boards/ehl_rt5660.c | 8 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 12 +- sound/soc/intel/boards/hsw_rt5640.c | 4 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 8 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 10 +- sound/soc/intel/boards/kbl_rt5660.c | 8 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 12 +- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 12 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- .../soc/intel/boards/skl_nau88l25_max98357a.c | 14 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 18 +- sound/soc/intel/boards/skl_rt286.c | 10 +- sound/soc/intel/boards/sof_cirrus_common.c | 2 +- sound/soc/intel/boards/sof_cs42l42.c | 12 +- sound/soc/intel/boards/sof_da7219_max98373.c | 8 +- sound/soc/intel/boards/sof_es8336.c | 14 +- sound/soc/intel/boards/sof_maxim_common.c | 8 +- sound/soc/intel/boards/sof_nau8825.c | 12 +- sound/soc/intel/boards/sof_pcm512x.c | 14 +- sound/soc/intel/boards/sof_realtek_common.c | 8 +- sound/soc/intel/boards/sof_rt5682.c | 16 +- sound/soc/intel/boards/sof_sdw.c | 18 +- sound/soc/intel/boards/sof_sdw_cs42l42.c | 2 +- sound/soc/intel/boards/sof_sdw_hdmi.c | 2 +- sound/soc/intel/boards/sof_sdw_maxim.c | 4 +- sound/soc/intel/boards/sof_sdw_rt5682.c | 2 +- sound/soc/intel/boards/sof_sdw_rt700.c | 2 +- sound/soc/intel/boards/sof_sdw_rt711.c | 2 +- sound/soc/intel/boards/sof_sdw_rt_amp.c | 4 +- .../boards/sof_sdw_rt_sdca_jack_common.c | 2 +- sound/soc/intel/boards/sof_ssp_amp.c | 8 +- sound/soc/intel/boards/sof_wm8804.c | 4 +- sound/soc/intel/catpt/pcm.c | 12 +- sound/soc/intel/keembay/kmb_platform.c | 4 +- sound/soc/intel/skylake/skl-pcm.c | 18 +- sound/soc/kirkwood/armada-370-db.c | 4 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/loongson/loongson_card.c | 4 +- sound/soc/loongson/loongson_dma.c | 4 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 22 +- .../mediatek/common/mtk-afe-platform-driver.c | 4 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 6 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 4 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 8 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 +- .../mediatek/mt8183/mt8183-da7219-max98357.c | 14 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 18 +- sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 12 +- .../mediatek/mt8186/mt8186-mt6366-common.c | 2 +- .../mt8186/mt8186-mt6366-da7219-max98357.c | 14 +- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 12 +- sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 +- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 20 +- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 6 +- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 22 +- sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 10 +- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 26 +-- sound/soc/meson/aiu-fifo.c | 2 +- sound/soc/meson/axg-card.c | 12 +- sound/soc/meson/axg-fifo.c | 2 +- sound/soc/meson/gx-card.c | 2 +- sound/soc/meson/meson-card-utils.c | 6 +- sound/soc/meson/meson-codec-glue.c | 2 +- sound/soc/mxs/mxs-sgtl5000.c | 6 +- sound/soc/pxa/pxa2xx-i2s.c | 4 +- sound/soc/pxa/spitz.c | 8 +- sound/soc/qcom/apq8016_sbc.c | 8 +- sound/soc/qcom/apq8096.c | 8 +- sound/soc/qcom/common.c | 6 +- sound/soc/qcom/lpass-cdc-dma.c | 16 +- sound/soc/qcom/lpass-platform.c | 50 ++-- sound/soc/qcom/qdsp6/q6apm-dai.c | 4 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 10 +- sound/soc/qcom/qdsp6/q6routing.c | 4 +- sound/soc/qcom/sc7180.c | 18 +- sound/soc/qcom/sc7280.c | 26 +-- sound/soc/qcom/sc8280xp.c | 8 +- sound/soc/qcom/sdm845.c | 36 +-- sound/soc/qcom/sdw.c | 6 +- sound/soc/qcom/sm8250.c | 10 +- sound/soc/qcom/storm.c | 4 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 6 +- sound/soc/rockchip/rk3399_gru_sound.c | 26 +-- sound/soc/rockchip/rockchip_i2s.c | 2 +- sound/soc/rockchip/rockchip_max98090.c | 8 +- sound/soc/rockchip/rockchip_rt5645.c | 8 +- sound/soc/samsung/aries_wm8994.c | 12 +- sound/soc/samsung/arndale.c | 10 +- sound/soc/samsung/bells.c | 16 +- sound/soc/samsung/i2s.c | 12 +- sound/soc/samsung/littlemill.c | 16 +- sound/soc/samsung/lowland.c | 4 +- sound/soc/samsung/midas_wm1811.c | 10 +- sound/soc/samsung/odroid.c | 8 +- sound/soc/samsung/pcm.c | 8 +- sound/soc/samsung/smdk_spdif.c | 4 +- sound/soc/samsung/smdk_wm8994.c | 4 +- sound/soc/samsung/smdk_wm8994pcm.c | 6 +- sound/soc/samsung/snow.c | 4 +- sound/soc/samsung/spdif.c | 14 +- sound/soc/samsung/speyside.c | 8 +- sound/soc/samsung/tm2_wm5110.c | 24 +- sound/soc/samsung/tobermory.c | 8 +- sound/soc/sh/dma-sh7760.c | 28 +-- sound/soc/sh/fsi.c | 4 +- sound/soc/sh/migor.c | 10 +- sound/soc/sh/rcar/core.c | 6 +- sound/soc/sh/rz-ssi.c | 4 +- sound/soc/soc-component.c | 24 +- sound/soc/soc-compress.c | 36 +-- sound/soc/soc-core.c | 20 +- sound/soc/soc-dai.c | 8 +- sound/soc/soc-dapm.c | 12 +- sound/soc/soc-generic-dmaengine-pcm.c | 10 +- sound/soc/soc-link.c | 14 +- sound/soc/soc-pcm.c | 90 +++---- sound/soc/soc-topology.c | 6 +- sound/soc/soc-utils.c | 6 +- sound/soc/sof/amd/acp-pcm.c | 2 +- sound/soc/sof/intel/hda-dai-ops.c | 22 +- sound/soc/sof/intel/hda-dai.c | 8 +- sound/soc/sof/intel/hda-pcm.c | 4 +- sound/soc/sof/intel/hda-stream.c | 2 +- sound/soc/sof/ipc3-pcm.c | 6 +- sound/soc/sof/ipc4-pcm.c | 8 +- sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- sound/soc/sof/nocodec.c | 2 +- sound/soc/sof/pcm.c | 18 +- sound/soc/sprd/sprd-pcm-compress.c | 4 +- sound/soc/sprd/sprd-pcm-dma.c | 4 +- sound/soc/starfive/jh7110_tdm.c | 2 +- sound/soc/stm/stm32_adfsdm.c | 24 +- sound/soc/stm/stm32_sai_sub.c | 4 +- sound/soc/sunxi/sun4i-codec.c | 12 +- sound/soc/sunxi/sun4i-spdif.c | 4 +- sound/soc/sunxi/sun50i-dmic.c | 2 +- sound/soc/tegra/tegra_asoc_machine.c | 2 +- sound/soc/tegra/tegra_audio_graph_card.c | 22 +- sound/soc/tegra/tegra_pcm.c | 4 +- sound/soc/tegra/tegra_wm8903.c | 4 +- sound/soc/ti/ams-delta.c | 4 +- sound/soc/ti/davinci-evm.c | 10 +- sound/soc/ti/j721e-evm.c | 12 +- sound/soc/ti/n810.c | 6 +- sound/soc/ti/omap-abe-twl6040.c | 10 +- sound/soc/ti/omap-hdmi.c | 2 +- sound/soc/ti/omap-mcbsp-st.c | 2 +- sound/soc/ti/omap-mcbsp.c | 8 +- sound/soc/ti/omap-mcpdm.c | 2 +- sound/soc/ti/omap-twl4030.c | 2 +- sound/soc/ti/omap3pandora.c | 6 +- sound/soc/ti/osk5912.c | 4 +- sound/soc/ti/rx51.c | 6 +- sound/soc/uniphier/aio-compress.c | 22 +- sound/soc/uniphier/aio-dma.c | 12 +- sound/soc/ux500/mop500_ab8500.c | 14 +- sound/soc/ux500/ux500_pcm.c | 4 +- sound/soc/xtensa/xtfpga-i2s.c | 4 +- 272 files changed, 1612 insertions(+), 1613 deletions(-) -- 2.25.1
