[PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver

[PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver

[Vijendar Mukunda]

update SPDX license for acp machine driver.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/acp-da7219-max98357a.c | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index e65e007..84e3906 100644
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -1,27 +1,8 @@
-/*
- * Machine driver for AMD ACP Audio engine using DA7219 & MAX98357 codec
- *
- * Copyright 2017 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
+// SPDX-License-Identifier: MIT
+//
+// Machine driver for AMD ACP Audio engine using DA7219, RT5682 & MAX98357 codec
+//
+//Copyright 2017-2021 Advanced Micro Devices, Inc.
 
 #include <sound/core.h>
 #include <sound/soc.h>
-- 
2.7.4

[PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver

[Vijendar Mukunda]

update SPDX license for acp machine driver.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/acp-da7219-max98357a.c | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index e65e007..84e3906 100644
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -1,27 +1,8 @@
-/*
- * Machine driver for AMD ACP Audio engine using DA7219 & MAX98357 codec
- *
- * Copyright 2017 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
+// SPDX-License-Identifier: MIT
+//
+// Machine driver for AMD ACP Audio engine using DA7219, RT5682 & MAX98357 codec
+//
+//Copyright 2017-2021 Advanced Micro Devices, Inc.
 
 #include <sound/core.h>
 #include <sound/soc.h>
-- 
2.7.4

[PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Vijendar Mukunda]

Fix ACPI dependency kernel warning produced by powerpc
allyesconfig.

sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
'cz_rt5682_card' defined but not used [-Wunused-variable]

sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
defined but not used [-Wunused-variable]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index 43f5d29..256c192 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -11,7 +11,7 @@ config SND_SOC_AMD_CZ_DA7219MX98357_MACH
 	select SND_SOC_MAX98357A
 	select SND_SOC_ADAU7002
 	select REGULATOR
-	depends on SND_SOC_AMD_ACP && I2C && GPIOLIB
+	depends on SND_SOC_AMD_ACP && I2C && GPIOLIB && ACPI
 	help
 	 This option enables machine driver for DA7219, RT5682 and MAX9835.
 
-- 
2.7.4

[PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Vijendar Mukunda]

Fix ACPI dependency kernel warning produced by powerpc
allyesconfig.

sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
'cz_rt5682_card' defined but not used [-Wunused-variable]

sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
defined but not used [-Wunused-variable]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
---
 sound/soc/amd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig
index 43f5d29..256c192 100644
--- a/sound/soc/amd/Kconfig
+++ b/sound/soc/amd/Kconfig
@@ -11,7 +11,7 @@ config SND_SOC_AMD_CZ_DA7219MX98357_MACH
 	select SND_SOC_MAX98357A
 	select SND_SOC_ADAU7002
 	select REGULATOR
-	depends on SND_SOC_AMD_ACP && I2C && GPIOLIB
+	depends on SND_SOC_AMD_ACP && I2C && GPIOLIB && ACPI
 	help
 	 This option enables machine driver for DA7219, RT5682 and MAX9835.
 
-- 
2.7.4

Re: [PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Arnd Bergmann]

On Fri, Mar 26, 2021 at 5:44 PM Vijendar Mukunda
<Vijendar.Mukunda@amd.com> wrote:
>
> Fix ACPI dependency kernel warning produced by powerpc
> allyesconfig.
>
> sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
> 'cz_rt5682_card' defined but not used [-Wunused-variable]
>
> sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
> defined but not used [-Wunused-variable]

I would suggest simply dropping the unnecessary #ifdef and
ACPI_PTR() guard.

It might be helpful to hide the Kconfig submenu under
'depends on X86 || COMPILE_TEST'.

       Arnd

Re: [PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Arnd Bergmann]

On Fri, Mar 26, 2021 at 5:44 PM Vijendar Mukunda
<Vijendar.Mukunda@amd.com> wrote:
>
> Fix ACPI dependency kernel warning produced by powerpc
> allyesconfig.
>
> sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
> 'cz_rt5682_card' defined but not used [-Wunused-variable]
>
> sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
> defined but not used [-Wunused-variable]

I would suggest simply dropping the unnecessary #ifdef and
ACPI_PTR() guard.

It might be helpful to hide the Kconfig submenu under
'depends on X86 || COMPILE_TEST'.

       Arnd

Re: [PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Mukunda,Vijendar]

On 3/26/21 10:14 PM, Arnd Bergmann wrote:
> On Fri, Mar 26, 2021 at 5:44 PM Vijendar Mukunda
> <Vijendar.Mukunda@amd.com> wrote:
>>
>> Fix ACPI dependency kernel warning produced by powerpc
>> allyesconfig.
>>
>> sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
>> 'cz_rt5682_card' defined but not used [-Wunused-variable]
>>
>> sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
>> defined but not used [-Wunused-variable]
> 
> I would suggest simply dropping the unnecessary #ifdef and
> ACPI_PTR() guard.
> 
> It might be helpful to hide the Kconfig submenu under
> 'depends on X86 || COMPILE_TEST'.
> 
>         Arnd
> 

Will drop the unnecessary safegaurd and will upload the new version.

Re: [PATCH 2/2] ASoC: amd: fix acpi dependency kernel warning

[Mukunda,Vijendar]

On 3/26/21 10:14 PM, Arnd Bergmann wrote:
> On Fri, Mar 26, 2021 at 5:44 PM Vijendar Mukunda
> <Vijendar.Mukunda@amd.com> wrote:
>>
>> Fix ACPI dependency kernel warning produced by powerpc
>> allyesconfig.
>>
>> sound/soc/amd/acp-da7219-max98357a.c:684:28: warning:
>> 'cz_rt5682_card' defined but not used [-Wunused-variable]
>>
>> sound/soc/amd/acp-da7219-max98357a.c:671:28: warning: 'cz_card'
>> defined but not used [-Wunused-variable]
> 
> I would suggest simply dropping the unnecessary #ifdef and
> ACPI_PTR() guard.
> 
> It might be helpful to hide the Kconfig submenu under
> 'depends on X86 || COMPILE_TEST'.
> 
>         Arnd
> 

Will drop the unnecessary safegaurd and will upload the new version.

Re: [PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver

[Mark Brown]

On Fri, 26 Mar 2021 22:14:30 +0530, Vijendar Mukunda wrote:
> update SPDX license for acp machine driver.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: amd: update spdx license for acp machine driver
      commit: 23f23db29ac996a824dce2b3a800c7a002f1c480
[2/2] ASoC: amd: fix acpi dependency kernel warning
      commit: d463cead11ace05c81de31a0fb9c2507c5c1d0a2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH RESEND 1/2] ASoC: amd: update spdx license for acp machine driver

[Mark Brown]

On Fri, 26 Mar 2021 22:14:30 +0530, Vijendar Mukunda wrote:
> update SPDX license for acp machine driver.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: amd: update spdx license for acp machine driver
      commit: 23f23db29ac996a824dce2b3a800c7a002f1c480
[2/2] ASoC: amd: fix acpi dependency kernel warning
      commit: d463cead11ace05c81de31a0fb9c2507c5c1d0a2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark