Commit 56bbfbfd authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: codecs: rt*: fix 'defined but not used' warning

Fix W=1 warning when ACPI is not defined
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200707190612.97799-14-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce7ed845
...@@ -1105,12 +1105,14 @@ static const struct i2c_device_id rt274_i2c_id[] = { ...@@ -1105,12 +1105,14 @@ static const struct i2c_device_id rt274_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, rt274_i2c_id); MODULE_DEVICE_TABLE(i2c, rt274_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt274_acpi_match[] = { static const struct acpi_device_id rt274_acpi_match[] = {
{ "10EC0274", 0 }, { "10EC0274", 0 },
{ "INT34C2", 0 }, { "INT34C2", 0 },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, rt274_acpi_match); MODULE_DEVICE_TABLE(acpi, rt274_acpi_match);
#endif
static int rt274_i2c_probe(struct i2c_client *i2c, static int rt274_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
......
...@@ -1079,11 +1079,13 @@ static const struct i2c_device_id rt286_i2c_id[] = { ...@@ -1079,11 +1079,13 @@ static const struct i2c_device_id rt286_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, rt286_i2c_id); MODULE_DEVICE_TABLE(i2c, rt286_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt286_acpi_match[] = { static const struct acpi_device_id rt286_acpi_match[] = {
{ "INT343A", 0 }, { "INT343A", 0 },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, rt286_acpi_match); MODULE_DEVICE_TABLE(acpi, rt286_acpi_match);
#endif
static const struct dmi_system_id force_combo_jack_table[] = { static const struct dmi_system_id force_combo_jack_table[] = {
{ {
......
...@@ -1145,11 +1145,13 @@ static const struct i2c_device_id rt298_i2c_id[] = { ...@@ -1145,11 +1145,13 @@ static const struct i2c_device_id rt298_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, rt298_i2c_id); MODULE_DEVICE_TABLE(i2c, rt298_i2c_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt298_acpi_match[] = { static const struct acpi_device_id rt298_acpi_match[] = {
{ "INT343A", 0 }, { "INT343A", 0 },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, rt298_acpi_match); MODULE_DEVICE_TABLE(acpi, rt298_acpi_match);
#endif
static const struct dmi_system_id force_combo_jack_table[] = { static const struct dmi_system_id force_combo_jack_table[] = {
{ {
......
...@@ -1241,12 +1241,14 @@ static const struct of_device_id rt5660_of_match[] = { ...@@ -1241,12 +1241,14 @@ static const struct of_device_id rt5660_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, rt5660_of_match); MODULE_DEVICE_TABLE(of, rt5660_of_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt5660_acpi_match[] = { static const struct acpi_device_id rt5660_acpi_match[] = {
{ "10EC5660", 0 }, { "10EC5660", 0 },
{ "10EC3277", 0 }, { "10EC3277", 0 },
{ }, { },
}; };
MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match); MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match);
#endif
static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev) static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev)
{ {
......
...@@ -614,11 +614,13 @@ static int rt5677_spi_probe(struct spi_device *spi) ...@@ -614,11 +614,13 @@ static int rt5677_spi_probe(struct spi_device *spi)
return ret; return ret;
} }
#ifdef CONFIG_ACPI
static const struct acpi_device_id rt5677_spi_acpi_id[] = { static const struct acpi_device_id rt5677_spi_acpi_id[] = {
{ "RT5677AA", 0 }, { "RT5677AA", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(acpi, rt5677_spi_acpi_id); MODULE_DEVICE_TABLE(acpi, rt5677_spi_acpi_id);
#endif
static struct spi_driver rt5677_spi_driver = { static struct spi_driver rt5677_spi_driver = {
.driver = { .driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment