lkml.org 
[lkml]   [2021]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 2/2] ASoC: amd: fix multiple definition error
Date
make W=1 ARCH=x86_64 error:
acp3x-rt5682-max9836.c:(.text+0x840): multiple definition of
`soc_is_rltk_max';
sound/soc/amd/acp-da7219-max98357a.o:acp-da7219-max98357a.c:
(.text+0xd00):first defined here

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
sound/soc/amd/acp-da7219-max98357a.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index 7fca4e78..458d9fdca 100644
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -34,7 +34,7 @@ static struct clk *da7219_dai_bclk;
static struct clk *rt5682_dai_wclk;
static struct clk *rt5682_dai_bclk;
extern bool bt_uart_enable;
-void *soc_is_rltk_max(struct device *dev);
+void *acp_soc_is_rltk_max(struct device *dev);

static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
{
@@ -666,7 +666,7 @@ static struct snd_soc_card cz_rt5682_card = {
.num_controls = ARRAY_SIZE(cz_mc_controls),
};

-void *soc_is_rltk_max(struct device *dev)
+void *acp_soc_is_rltk_max(struct device *dev)
{
const struct acpi_device_id *match;

@@ -715,7 +715,7 @@ static int cz_probe(struct platform_device *pdev)
struct regulator_dev *rdev;
struct device *dev = &pdev->dev;

- card = (struct snd_soc_card *)soc_is_rltk_max(dev);
+ card = (struct snd_soc_card *)acp_soc_is_rltk_max(dev);
if (!card)
return -ENODEV;
if (!strcmp(card->name, "acpd7219m98357")) {
--
2.7.4
\
 
 \ /
  Last update: 2021-03-17 21:18    [W:0.110 / U:0.624 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site