ASoC: amd: Renaming snd-soc-card structure and fields

As in future our machine driver supports multiple codecs
So changing naming convention of snd_soc_card struct and its fields.

Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Link: https://lore.kernel.org/r/20200728160255.31020-2-Vishnuvardhanrao.Ravulapati@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index 6009e44..8b5af06 100644 (file)
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -290,7 +290,7 @@ static const struct snd_kcontrol_new acp3x_dmic_mux_control =
        SOC_DAPM_ENUM_EXT("DMIC Select Mux", acp3x_dmic_enum,
                          dmic_get, dmic_set);
 
-static const struct snd_soc_dapm_widget acp3x_widgets[] = {
+static const struct snd_soc_dapm_widget acp3x_5682_widgets[] = {
        SND_SOC_DAPM_HP("Headphone Jack", NULL),
        SND_SOC_DAPM_SPK("Spk", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -298,7 +298,7 @@ static const struct snd_soc_dapm_widget acp3x_widgets[] = {
                         &acp3x_dmic_mux_control),
 };
 
-static const struct snd_soc_dapm_route acp3x_audio_route[] = {
+static const struct snd_soc_dapm_route acp3x_5682_audio_route[] = {
        {"Headphone Jack", NULL, "HPOL"},
        {"Headphone Jack", NULL, "HPOR"},
        {"IN1P", NULL, "Headset Mic"},
@@ -307,23 +307,23 @@ static const struct snd_soc_dapm_route acp3x_audio_route[] = {
        {"Dmic Mux", "Rear Mic", "DMIC"},
 };
 
-static const struct snd_kcontrol_new acp3x_mc_controls[] = {
+static const struct snd_kcontrol_new acp3x_5682_mc_controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone Jack"),
        SOC_DAPM_PIN_SWITCH("Spk"),
        SOC_DAPM_PIN_SWITCH("Headset Mic"),
 };
 
-static struct snd_soc_card acp3x_card = {
+static struct snd_soc_card acp3x_5682 = {
        .name = "acp3xalc5682m98357",
        .owner = THIS_MODULE,
        .dai_link = acp3x_dai_5682_98357,
        .num_links = ARRAY_SIZE(acp3x_dai_5682_98357),
-       .dapm_widgets = acp3x_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(acp3x_widgets),
-       .dapm_routes = acp3x_audio_route,
-       .num_dapm_routes = ARRAY_SIZE(acp3x_audio_route),
-       .controls = acp3x_mc_controls,
-       .num_controls = ARRAY_SIZE(acp3x_mc_controls),
+       .dapm_widgets = acp3x_5682_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(acp3x_5682_widgets),
+       .dapm_routes = acp3x_5682_audio_route,
+       .num_dapm_routes = ARRAY_SIZE(acp3x_5682_audio_route),
+       .controls = acp3x_5682_mc_controls,
+       .num_controls = ARRAY_SIZE(acp3x_5682_mc_controls),
 };
 
 static int acp3x_probe(struct platform_device *pdev)
@@ -336,8 +336,8 @@ static int acp3x_probe(struct platform_device *pdev)
        if (!machine)
                return -ENOMEM;
 
-       card = &acp3x_card;
-       acp3x_card.dev = &pdev->dev;
+       card = &acp3x_5682;
+       acp3x_5682.dev = &pdev->dev;
        platform_set_drvdata(pdev, card);
        snd_soc_card_set_drvdata(card, machine);
 
@@ -348,11 +348,11 @@ static int acp3x_probe(struct platform_device *pdev)
                return PTR_ERR(dmic_sel);
        }
 
-       ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_card);
+       ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_5682);
        if (ret) {
                dev_err(&pdev->dev,
                                "devm_snd_soc_register_card(%s) failed: %d\n",
-                               acp3x_card.name, ret);
+                               acp3x_5682.name, ret);
                return ret;
        }
        return 0;