Commit e4746d94 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Takashi Iwai
Browse files

ASoC: Intel: Skylake: 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: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220816111727.3218543-2-cezary.rojewski@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5e92a64b

sound/soc/intel/skylake/skl.c

+29 −0
Original line number Diff line number Diff line
@@ -689,6 +689,35 @@ static void load_codec_module(struct hda_codec *codec) 


#endif /* CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC */



static void skl_codec_device_exit(struct device *dev)

{

	snd_hdac_device_exit(dev_to_hdac_dev(dev));

}



static __maybe_unused struct hda_codec *skl_codec_device_init(struct hdac_bus *bus, int addr)

{

	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 = HDA_DEV_ASOC;

	codec->core.dev.release = skl_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 the given codec address

 */