ASoC: SOF: Intel: Introduce HDA codec init and exit routines

Preliminary step in making snd_hda_codec_device_init() the only
constructor for struct hda_codec instances. To do that, existing usage
of hdac_ext equivalents has to be dropped.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220816111727.3218543-3-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
index 2f3f4a7..4c128ba 100644 (file)
--- a/sound/soc/sof/intel/hda-codec.c
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -109,6 +109,36 @@ EXPORT_SYMBOL_NS(hda_codec_jack_check, SND_SOC_SOF_HDA_AUDIO_CODEC);
 #define is_generic_config(x)   0
 #endif
 
+static void hda_codec_device_exit(struct device *dev)
+{
+       snd_hdac_device_exit(dev_to_hdac_dev(dev));
+}
+
+static __maybe_unused struct hda_codec *
+hda_codec_device_init(struct hdac_bus *bus, int addr, int type)
+{
+       struct hda_codec *codec;
+       int ret;
+
+       codec = snd_hda_codec_device_init(to_hda_bus(bus), addr, "ehdaudio%dD%d", bus->idx, addr);
+       if (IS_ERR(codec)) {
+               dev_err(bus->dev, "device init failed for hdac device\n");
+               return codec;
+       }
+
+       codec->core.type = type;
+       codec->core.dev.release = hda_codec_device_exit;
+
+       ret = snd_hdac_device_register(&codec->core);
+       if (ret) {
+               dev_err(bus->dev, "failed to register hdac device\n");
+               snd_hdac_device_exit(&codec->core);
+               return ERR_PTR(ret);
+       }
+
+       return codec;
+}
+
 /* probe individual codec */
 static int hda_codec_probe(struct snd_sof_dev *sdev, int address,
                           bool hda_codec_use_common_hdmi)