Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: rt5659: avoid unused variable warning for rt5659_acpi_match

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 changes both the OF match table and the ACPI match table
to follow the same style, using ACPI_PTR/of_match_ptr to
make the reference conditional, and using an #ifdef to hide
the table. This also adds the missing MODULE_DEVICE_TABLE for
the OF case and adapts the formatting to the same style.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Arnd Bergmann and committed by
Mark Brown
2256b8d2 1ca2cf8c

+10 -5
+10 -5
sound/soc/codecs/rt5659.c
··· 4183 4183 regmap_write(rt5659->regmap, RT5659_RESET, 0); 4184 4184 } 4185 4185 4186 + #ifdef CONFIG_OF 4186 4187 static const struct of_device_id rt5659_of_match[] = { 4187 4188 { .compatible = "realtek,rt5658", }, 4188 4189 { .compatible = "realtek,rt5659", }, 4189 - {}, 4190 + { }, 4190 4191 }; 4192 + MODULE_DEVICE_TABLE(of, rt5659_of_match); 4193 + #endif 4191 4194 4195 + #ifdef CONFIG_ACPI 4192 4196 static struct acpi_device_id rt5659_acpi_match[] = { 4193 - { "10EC5658", 0}, 4194 - { "10EC5659", 0}, 4195 - { }, 4197 + { "10EC5658", 0, }, 4198 + { "10EC5659", 0, }, 4199 + { }, 4196 4200 }; 4197 4201 MODULE_DEVICE_TABLE(acpi, rt5659_acpi_match); 4202 + #endif 4198 4203 4199 4204 struct i2c_driver rt5659_i2c_driver = { 4200 4205 .driver = { 4201 4206 .name = "rt5659", 4202 4207 .owner = THIS_MODULE, 4203 - .of_match_table = rt5659_of_match, 4208 + .of_match_table = of_match_ptr(rt5659_of_match), 4204 4209 .acpi_match_table = ACPI_PTR(rt5659_acpi_match), 4205 4210 }, 4206 4211 .probe = rt5659_i2c_probe,