ASoC: avoid unused variable warning for rt5659_acpi_match

Commit Message

Arnd Bergmann Jan. 20, 2016, 10:43 a.m. UTC

The newly added rt5659 codec driver unconditionally defines an
ACPI device match table but then uses ACPI_PTR() to remove the
only reference to it, so we get a harmless build warning:

sound/soc/codecs/rt5659.c:4200:30: warning: 'rt5659_acpi_match' defined but not used [-Wunused-variable]
 static struct acpi_device_id rt5659_acpi_match[] = {

This removes the ACPI_PTR() to avoid the warning.

Signed-off-by: Arnd Bergmann <[e-mail]>
---
This is a harmless regression against v4.4, found on ARM randconfig builds

Comments

Mark Brown Jan. 20, 2016, 10:45 a.m. UTC | #1

On Wed, Jan 20, 2016 at 11:43:48AM +0100, Arnd Bergmann wrote:
> The newly added rt5659 codec driver unconditionally defines an
> ACPI device match table but then uses ACPI_PTR() to remove the
> only reference to it, so we get a harmless build warning:

> sound/soc/codecs/rt5659.c:4200:30: warning: 'rt5659_acpi_match' defined but not used [-Wunused-variable]
>  static struct acpi_device_id rt5659_acpi_match[] = {

> This removes the ACPI_PTR() to avoid the warning.

Why is this a better fix than conditionally defining the table?

Arnd Bergmann Jan. 20, 2016, 10:58 a.m. UTC | #2

On Wednesday 20 January 2016 10:45:55 Mark Brown wrote:
> On Wed, Jan 20, 2016 at 11:43:48AM +0100, Arnd Bergmann wrote:
> > The newly added rt5659 codec driver unconditionally defines an
> > ACPI device match table but then uses ACPI_PTR() to remove the
> > only reference to it, so we get a harmless build warning:
> 
> > sound/soc/codecs/rt5659.c:4200:30: warning: 'rt5659_acpi_match' defined but not used [-Wunused-variable]
> >  static struct acpi_device_id rt5659_acpi_match[] = {
> 
> > This removes the ACPI_PTR() to avoid the warning.
> 
> Why is this a better fix than conditionally defining the table?

I'm not overly fond of adding #ifdef if it can be avoided. In this case,
both approaches seemed reasonable (either add an #ifdef or waste a couple
of bytes), and I picked at random. I'll send you the alternative as well,
please apply whichever one you prefer.

	Arnd

Patch

diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index c166d9394c69..5a1d789ba58d 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -4201,7 +4201,7 @@  struct i2c_driver rt5659_i2c_driver = {
 		.name = "rt5659",
 		.owner = THIS_MODULE,
 		.of_match_table = rt5659_of_match,
-		.acpi_match_table = ACPI_PTR(rt5659_acpi_match),
+		.acpi_match_table = rt5659_acpi_match,
 	},
 	.probe = rt5659_i2c_probe,
 	.remove = rt5659_i2c_remove,