Unverified Commit 2d3694fd authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ALSA: hda: intel-nhlt: Move structs out of #define block 



As functions prototypes regerdless of CONFIG options as well as some
code depend on structures defined in sound/intel-nhlt.h header, move
them out of #define block. This allows to compile code depending on
mentioned header with "depends on ACPI || COMPILE_TEST" in Kconfig.

Fixes: 47a1886a ("ASoC: Intel: avs: Enable AVS driver only on x86 platforms")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Suggested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220426200539.894010-1-amadeuszx.slawinski@linux.intel.com


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

include/sound/intel-nhlt.h

+2 −4
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ enum nhlt_device_type { 
	NHLT_DEVICE_INVALID

};



#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT)



struct wav_fmt {

	u16 fmt_tag;

	u16 channels;
@@ -126,6 +124,8 @@ enum { 
	NHLT_MIC_ARRAY_VENDOR_DEFINED = 0xf,

};



#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_INTEL_NHLT)



struct nhlt_acpi_table *intel_nhlt_init(struct device *dev);



void intel_nhlt_free(struct nhlt_acpi_table *addr);
@@ -143,8 +143,6 @@ intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, 


#else



struct nhlt_acpi_table;



static inline struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)

{

	return NULL;