Unverified Commit 3e9d5b09 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Relocate inline definitions from hda.h to hda.c for sdw 



Move the only locally needed inline functions to hda.c when
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE is not enabled to make the header file
less cluttered with information no needed to be there.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210915071805.5704-4-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/hda.c

+32 −1
Original line number Diff line number Diff line
@@ -294,7 +294,38 @@ void hda_sdw_process_wakeen(struct snd_sof_dev *sdev) 
	sdw_intel_process_wakeen_event(hdev->sdw);

}



#endif

#else /* IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) */

static inline int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_probe(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_exit(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline bool hda_dsp_check_sdw_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline irqreturn_t hda_dsp_sdw_thread(int irq, void *context)

{

	return IRQ_HANDLED;

}



static inline bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

{

	return false;

}



#endif /* IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) */



/*

 * Debug

sound/soc/sof/intel/hda.h

+0 −30
Original line number Diff line number Diff line
@@ -684,45 +684,15 @@ bool hda_common_check_sdw_irq(struct snd_sof_dev *sdev); 


#else



static inline int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_probe(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_startup(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_exit(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable)

{

}



static inline bool hda_dsp_check_sdw_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline irqreturn_t hda_dsp_sdw_thread(int irq, void *context)

{

	return IRQ_HANDLED;

}



static inline bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline void hda_sdw_process_wakeen(struct snd_sof_dev *sdev)

{

}