diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2025-11-11 03:32:46 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-11-17 03:17:38 +0300 |
| commit | a30381e9cc2d32d8e0d4077cfa6aab0c70d34105 (patch) | |
| tree | e8b72ed946016586d42b818b5fc8013c2b0e284b | |
| parent | be0c2c4010c2e641772408c2bce1649e5db20f2f (diff) | |
| download | linux-a30381e9cc2d32d8e0d4077cfa6aab0c70d34105.tar.xz | |
ASoC: intel: boards: sof_board_helpers: convert to snd_soc_dapm_xxx()
This patch converts below functions.
dapm->dev -> snd_soc_dapm_to_dev()
dapm->card -> snd_soc_dapm_to_card()
dapm->component -> snd_soc_dapm_to_component()
dapm_kcontrol_get_value() -> snd_soc_dapm_kcontrol_get_value()
snd_soc_component_enable_pin() -> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked() -> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin() -> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked() -> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin() -> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked() -> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status() -> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin() -> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked() -> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level() -> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level() -> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level() -> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm() -> snd_soc_component_to_dapm()
snd_soc_dapm_kcontrol_component() -> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget() -> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm() -> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin() -> snd_soc_dapm_disable_pin()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/87o6p9wgr6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/boards/sof_board_helpers.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c index 2ea1dda446ec..f741a1e142be 100644 --- a/sound/soc/intel/boards/sof_board_helpers.c +++ b/sound/soc/intel/boards/sof_board_helpers.c @@ -51,16 +51,17 @@ static const struct snd_soc_dapm_route dmic_routes[] = { static int dmic_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); int ret; - ret = snd_soc_dapm_new_controls(&card->dapm, dmic_widgets, + ret = snd_soc_dapm_new_controls(dapm, dmic_widgets, ARRAY_SIZE(dmic_widgets)); if (ret) { dev_err(rtd->dev, "fail to add dmic widgets, ret %d\n", ret); return ret; } - ret = snd_soc_dapm_add_routes(&card->dapm, dmic_routes, + ret = snd_soc_dapm_add_routes(dapm, dmic_routes, ARRAY_SIZE(dmic_routes)); if (ret) { dev_err(rtd->dev, "fail to add dmic routes, ret %d\n", ret); @@ -111,16 +112,17 @@ static const struct snd_soc_dapm_route hda_routes[] = { static int hda_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); int ret; - ret = snd_soc_dapm_new_controls(&card->dapm, hda_widgets, + ret = snd_soc_dapm_new_controls(dapm, hda_widgets, ARRAY_SIZE(hda_widgets)); if (ret) { dev_err(rtd->dev, "fail to add hda widgets, ret %d\n", ret); return ret; } - ret = snd_soc_dapm_add_routes(&card->dapm, hda_routes, + ret = snd_soc_dapm_add_routes(dapm, hda_routes, ARRAY_SIZE(hda_routes)); if (ret) dev_err(rtd->dev, "fail to add hda routes, ret %d\n", ret); |