Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: mediatek: mt8195-mt6359: 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/87346lwgpl.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
8d5a9332 af535c76

+13 -8
+13 -8
sound/soc/mediatek/mt8195/mt8195-mt6359.c
··· 451 451 struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); 452 452 struct mt8195_afe_private *afe_priv = afe->platform_priv; 453 453 struct snd_soc_card *card = rtd->card; 454 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 454 455 int ret; 455 456 456 457 priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2]; ··· 478 477 return ret; 479 478 } 480 479 481 - ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt5682_routes, 480 + ret = snd_soc_dapm_add_routes(dapm, mt8195_rt5682_routes, 482 481 ARRAY_SIZE(mt8195_rt5682_routes)); 483 482 if (ret) 484 483 dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); ··· 548 547 static int mt8195_rt1011_init(struct snd_soc_pcm_runtime *rtd) 549 548 { 550 549 struct snd_soc_card *card = rtd->card; 550 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 551 551 int ret; 552 552 553 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8195_dual_speaker_widgets, 553 + ret = snd_soc_dapm_new_controls(dapm, mt8195_dual_speaker_widgets, 554 554 ARRAY_SIZE(mt8195_dual_speaker_widgets)); 555 555 if (ret) { 556 556 dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); ··· 566 564 return ret; 567 565 } 568 566 569 - ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt1011_routes, 567 + ret = snd_soc_dapm_add_routes(dapm, mt8195_rt1011_routes, 570 568 ARRAY_SIZE(mt8195_rt1011_routes)); 571 569 if (ret) 572 570 dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); ··· 577 575 static int mt8195_dumb_amp_init(struct snd_soc_pcm_runtime *rtd) 578 576 { 579 577 struct snd_soc_card *card = rtd->card; 578 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 580 579 int ret; 581 580 582 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8195_speaker_widgets, 581 + ret = snd_soc_dapm_new_controls(dapm, mt8195_speaker_widgets, 583 582 ARRAY_SIZE(mt8195_speaker_widgets)); 584 583 if (ret) { 585 584 dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); ··· 601 598 static int mt8195_rt1019_init(struct snd_soc_pcm_runtime *rtd) 602 599 { 603 600 struct snd_soc_card *card = rtd->card; 601 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 604 602 int ret; 605 603 606 604 ret = mt8195_dumb_amp_init(rtd); 607 605 if (ret) 608 606 return ret; 609 607 610 - ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt1019_routes, 608 + ret = snd_soc_dapm_add_routes(dapm, mt8195_rt1019_routes, 611 609 ARRAY_SIZE(mt8195_rt1019_routes)); 612 610 if (ret) 613 611 dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); ··· 619 615 static int mt8195_max98390_init(struct snd_soc_pcm_runtime *rtd) 620 616 { 621 617 struct snd_soc_card *card = rtd->card; 618 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 622 619 int ret; 623 620 624 - ret = snd_soc_dapm_new_controls(&card->dapm, mt8195_dual_speaker_widgets, 621 + ret = snd_soc_dapm_new_controls(dapm, mt8195_dual_speaker_widgets, 625 622 ARRAY_SIZE(mt8195_dual_speaker_widgets)); 626 623 if (ret) { 627 624 dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret); ··· 637 632 return ret; 638 633 } 639 634 640 - ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_max98390_routes, 635 + ret = snd_soc_dapm_add_routes(dapm, mt8195_max98390_routes, 641 636 ARRAY_SIZE(mt8195_max98390_routes)); 642 637 if (ret) 643 638 dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); ··· 660 655 static int mt8195_set_bias_level_post(struct snd_soc_card *card, 661 656 struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level) 662 657 { 663 - struct snd_soc_component *component = dapm->component; 658 + struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); 664 659 struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card); 665 660 struct mt8195_mt6359_priv *priv = soc_card_data->mach_priv; 666 661 int ret;