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 <[email protected]>
Signed-off-by: Vijendar Mukunda <[email protected]>
---
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
On Thu, Mar 18, 2021 at 02:03:47AM +0530, Vijendar Mukunda wrote:
> 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
In general you should put fixes at the start of the patch series, or if
this is a fix for patch 1 that was spotted by the bot when it was posted
on the list then you should just roll your fix into new versions of
patch 1.
On 18/03/21 6:32 pm, Mark Brown wrote:
> On Thu, Mar 18, 2021 at 02:03:47AM +0530, Vijendar Mukunda wrote:
>> 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
>
> In general you should put fixes at the start of the patch series, or if
> this is a fix for patch 1 that was spotted by the bot when it was posted
> on the list then you should just roll your fix into new versions of
> patch 1.
>
We will roll this fix into new version of patch I