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

ASoC: soc-acpi: add static inline fallbacks when CONFIG_ACPI=n 



Fix compilation issues reported by 0day-Kbuild with sparc64 w/ SOF.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 51b033c2

include/sound/soc-acpi.h

+21 −7
Original line number Diff line number Diff line
@@ -22,20 +22,37 @@ struct snd_soc_acpi_package_context { 
#define SND_ACPI_I2C_ID_LEN (4 + ACPI_ID_LEN + 3 + 1)



#if IS_ENABLED(CONFIG_ACPI)

/* acpi match */

struct snd_soc_acpi_mach *

snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines);



bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],

				    struct snd_soc_acpi_package_context *ctx);



/* check all codecs */

struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg);



#else

/* acpi match */

static inline struct snd_soc_acpi_mach *

snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)

{

	return NULL;

}



static inline bool

snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],

				   struct snd_soc_acpi_package_context *ctx)

{

	return false;

}

#endif



/* acpi match */

struct snd_soc_acpi_mach *

snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines);

/* check all codecs */

static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg)

{

	return NULL;

}

#endif



/**

 * snd_soc_acpi_mach_params: interface for machine driver configuration
@@ -105,7 +122,4 @@ struct snd_soc_acpi_codecs { 
	u8 codecs[SND_SOC_ACPI_MAX_CODECS][ACPI_ID_LEN];

};



/* check all codecs */

struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg);



#endif