ASoC: Intel: avs: rt298: Adjust platform name

The name of the platform component matches the name of the card's
platform_device.

This allows for simplifying card and dai_link initialization:
- drop mach->mach_params.platform usage
- drop snd_soc_fixup_dai_links_platform_name() usage

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Message-ID: <20250902094853.1231842-14-cezary.rojewski@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c
index 7be34c8ad167a9bdf9ffaa94a564ed386b8d0156..2d7a7748d5777f67a7f5540763fac8606d5a690d 100644 (file)
--- a/sound/soc/intel/avs/boards/rt298.c
+++ b/sound/soc/intel/avs/boards/rt298.c
@@ -132,8 +132,8 @@ static const struct snd_soc_ops avs_rt298_ops = {
        .hw_params = avs_rt298_hw_params,
 };
 
-static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,
-                              int tdm_slot, struct snd_soc_dai_link **dai_link)
+static int avs_create_dai_link(struct device *dev, int ssp_port, int tdm_slot,
+                              struct snd_soc_dai_link **dai_link)
 {
        struct snd_soc_dai_link_component *platform;
        struct snd_soc_dai_link *dl;
@@ -143,8 +143,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        if (!dl || !platform)
                return -ENOMEM;
 
-       platform->name = platform_name;
-
        dl->name = devm_kasprintf(dev, GFP_KERNEL,
                                  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));
        dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
@@ -159,6 +157,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
        if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
                return -ENOMEM;
 
+       platform->name = dev_name(dev);
        dl->num_cpus = 1;
        dl->num_codecs = 1;
        dl->platforms = platform;
@@ -203,18 +202,16 @@ static int avs_rt298_probe(struct platform_device *pdev)
        struct snd_soc_card *card;
        struct snd_soc_jack *jack;
        struct device *dev = &pdev->dev;
-       const char *pname;
        int ssp_port, tdm_slot, ret;
 
        mach = dev_get_platdata(dev);
-       pname = mach->mach_params.platform;
        pdata = mach->pdata;
 
        ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);
        if (ret)
                return ret;
 
-       ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);
+       ret = avs_create_dai_link(dev, ssp_port, tdm_slot, &dai_link);
        if (ret) {
                dev_err(dev, "Failed to create dai link: %d", ret);
                return ret;
@@ -246,10 +243,6 @@ static int avs_rt298_probe(struct platform_device *pdev)
        card->fully_routed = true;
        snd_soc_card_set_drvdata(card, jack);
 
-       ret = snd_soc_fixup_dai_links_platform_name(card, pname);
-       if (ret)
-               return ret;
-
        return devm_snd_soc_register_deferrable_card(dev, card);
 }