[alsa-devel] [PATCH]: ASoC: intel: make function stub static

Randy Dunlap rdunlap at infradead.org
Fri May 20 17:38:54 CEST 2016


From: Randy Dunlap <rdunlap at infradead.org>

This function stub should have been 'static' in the original patch
so that multiple uses of the header file (in different drivers)
will not cause multiple function definitions.

sound/soc/intel/boards/built-in.o: In function `sst_acpi_find_name_from_hid':
(.text+0x560): multiple definition of `sst_acpi_find_name_from_hid'
sound/soc/intel/atom/built-in.o:(.text+0x10610): first defined here
../scripts/Makefile.build:369: recipe for target 'sound/soc/intel/built-in.o' failed

Fixes: f17131a93f43: add function stub when ACPI is not enabled

Signed-off-by: Randy Dunlap <rdunlap at infradead.org>
Cc: Borislav Petkov <bp at alien8.de>
Cc: Subhransu S. Prusty <subhransu.s.prusty at intel.com>
Cc: Jie Yang <yang.jie at linux.intel.com>
Cc: alsa-devel at alsa-project.org
---
 sound/soc/intel/common/sst-acpi.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20160520.orig/sound/soc/intel/common/sst-acpi.h
+++ linux-next-20160520/sound/soc/intel/common/sst-acpi.h
@@ -20,7 +20,7 @@
 #if IS_ENABLED(CONFIG_ACPI)
 const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]);
 #else
-inline const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
+static inline const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
 {
 	return NULL;
 }


More information about the Alsa-devel mailing list