Commit 2256b8d2 authored Jan 20, 2016 by Arnd Bergmann Committed by Mark Brown Jan 21, 2016

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>

parent 1ca2cf8c

sound/soc/codecs/rt5659.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -4183,24 +4183,29 @@ void rt5659_i2c_shutdown(struct i2c_client *client)
		regmap_write(rt5659->regmap, RT5659_RESET, 0);
		}

		#ifdef CONFIG_OF
		static const struct of_device_id rt5659_of_match[] = {
		{ .compatible = "realtek,rt5658", },
		{ .compatible = "realtek,rt5659", },
		{ },
		};
		MODULE_DEVICE_TABLE(of, rt5659_of_match);
		#endif

		#ifdef CONFIG_ACPI
		static struct acpi_device_id rt5659_acpi_match[] = {
		{ "10EC5658", 0},
		{ "10EC5659", 0},
		{ "10EC5658", 0, },
		{ "10EC5659", 0, },
		{ },
		};
		MODULE_DEVICE_TABLE(acpi, rt5659_acpi_match);
		#endif

		struct i2c_driver rt5659_i2c_driver = {
		.driver = {
		.name = "rt5659",
		.owner = THIS_MODULE,
		.of_match_table = rt5659_of_match,
		.of_match_table = of_match_ptr(rt5659_of_match),
		.acpi_match_table = ACPI_PTR(rt5659_acpi_match),
		},
		.probe = rt5659_i2c_probe,