Unverified Commit d4bfba1e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-codec: add hda_codec_device_remove() helper 



Continue split between controller and codec.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-10-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3246a6c9

sound/soc/sof/intel/hda-codec.c

+9 −0
Original line number Diff line number Diff line
@@ -286,6 +286,15 @@ void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status) 
}

EXPORT_SYMBOL_NS_GPL(hda_codec_set_codec_wakeup, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_device_remove(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);



	/* codec removal, invoke bus_device_remove */

	snd_hdac_ext_bus_device_remove(bus);

}

EXPORT_SYMBOL_NS_GPL(hda_codec_device_remove, SND_SOC_SOF_HDA_AUDIO_CODEC);



#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) && IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)

sound/soc/sof/intel/hda.c

+1 −4
Original line number Diff line number Diff line
@@ -1173,10 +1173,7 @@ int hda_dsp_remove(struct snd_sof_dev *sdev) 
	/* cancel any attempt for DSP D0I3 */

	cancel_delayed_work_sync(&hda->d0i3_work);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* codec removal, invoke bus_device_remove */

	snd_hdac_ext_bus_device_remove(bus);

#endif

	hda_codec_device_remove(sdev);



	hda_sdw_exit(sdev);

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -722,6 +722,7 @@ void hda_codec_init_cmd_io(struct snd_sof_dev *sdev); 
void hda_codec_detect_mask(struct snd_sof_dev *sdev);

void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev);

void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status);

void hda_codec_device_remove(struct snd_sof_dev *sdev);



#else
@@ -733,6 +734,7 @@ static inline void hda_codec_init_cmd_io(struct snd_sof_dev *sdev) { } 
static inline void hda_codec_detect_mask(struct snd_sof_dev *sdev) { }

static inline void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev) { }

static inline void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status) { }

static inline void hda_codec_device_remove(struct snd_sof_dev *sdev) { }



#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */