]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: Intel: sof_sdw_rt_sdca_jack_common: use dai parameter
authorBard Liao <yung-chuan.liao@linux.intel.com>
Mon, 27 May 2024 19:35:40 +0000 (14:35 -0500)
committerMark Brown <broonie@kernel.org>
Wed, 29 May 2024 10:10:48 +0000 (11:10 +0100)
The dai is passed from the parameter. We don't need to find the dai
by name.

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240527193552.165567-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c

index 012195c5051917f23e6f35ccc44018ea3559f252..4254e30ee4c3dd7b5ef2d9462ceeaf400c52f993 100644 (file)
@@ -74,10 +74,6 @@ static struct snd_soc_jack_pin rt_sdca_jack_pins[] = {
        },
 };
 
-static const char * const jack_codecs[] = {
-       "rt711", "rt712", "rt713", "rt722"
-};
-
 /*
  * The sdca suffix is required for rt711 since there are two generations of the same chip.
  * RT713 is an SDCA device but the sdca suffix is required for backwards-compatibility with
@@ -91,17 +87,12 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *d
 {
        struct snd_soc_card *card = rtd->card;
        struct mc_private *ctx = snd_soc_card_get_drvdata(card);
-       struct snd_soc_dai *codec_dai;
        struct snd_soc_component *component;
        struct snd_soc_jack *jack;
        int ret;
        int i;
 
-       codec_dai = get_codec_dai_by_name(rtd, jack_codecs, ARRAY_SIZE(jack_codecs));
-       if (!codec_dai)
-               return -EINVAL;
-
-       component = codec_dai->component;
+       component = dai->component;
        card->components = devm_kasprintf(card->dev, GFP_KERNEL,
                                          "%s hs:%s",
                                          card->components, component->name_prefix);