From: Randy Dunlap <rdunlap@infradead.org>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>,
Jie Yang <yang.jie@linux.intel.com>,
Borislav Petkov <bp@alien8.de>,
alsa-devel@alsa-project.org
Subject: [PATCH]: ASoC: intel: make function stub static
Date: Fri, 20 May 2016 08:38:54 -0700 [thread overview]
Message-ID: <573F2F8E.5020704@infradead.org> (raw)
From: Randy Dunlap <rdunlap@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@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: alsa-devel@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;
}
next reply other threads:[~2016-05-20 15:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 15:38 Randy Dunlap [this message]
2016-05-24 16:25 ` Applied "ASoC: intel: make function stub static" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=573F2F8E.5020704@infradead.org \
--to=rdunlap@infradead.org \
--cc=alsa-devel@alsa-project.org \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=subhransu.s.prusty@intel.com \
--cc=yang.jie@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.