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

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.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce7ed845

sound/soc/codecs/rt274.c

+2 −0
Original line number Diff line number Diff line
@@ -1105,12 +1105,14 @@ static const struct i2c_device_id rt274_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, rt274_i2c_id);



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt274_acpi_match[] = {

	{ "10EC0274", 0 },

	{ "INT34C2", 0 },

	{},

};

MODULE_DEVICE_TABLE(acpi, rt274_acpi_match);

#endif



static int rt274_i2c_probe(struct i2c_client *i2c,

			   const struct i2c_device_id *id)

sound/soc/codecs/rt286.c

+2 −0
Original line number Diff line number Diff line
@@ -1079,11 +1079,13 @@ static const struct i2c_device_id rt286_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, rt286_i2c_id);



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt286_acpi_match[] = {

	{ "INT343A", 0 },

	{},

};

MODULE_DEVICE_TABLE(acpi, rt286_acpi_match);

#endif



static const struct dmi_system_id force_combo_jack_table[] = {

	{

sound/soc/codecs/rt298.c

+2 −0
Original line number Diff line number Diff line
@@ -1145,11 +1145,13 @@ static const struct i2c_device_id rt298_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, rt298_i2c_id);



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt298_acpi_match[] = {

	{ "INT343A", 0 },

	{},

};

MODULE_DEVICE_TABLE(acpi, rt298_acpi_match);

#endif



static const struct dmi_system_id force_combo_jack_table[] = {

	{

sound/soc/codecs/rt5660.c

+2 −0
Original line number Diff line number Diff line
@@ -1241,12 +1241,14 @@ static const struct of_device_id rt5660_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, rt5660_of_match);



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt5660_acpi_match[] = {

	{ "10EC5660", 0 },

	{ "10EC3277", 0 },

	{ },

};

MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match);

#endif



static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev)

{

sound/soc/codecs/rt5677-spi.c

+2 −0
Original line number Diff line number Diff line
@@ -614,11 +614,13 @@ static int rt5677_spi_probe(struct spi_device *spi) 
	return ret;

}



#ifdef CONFIG_ACPI

static const struct acpi_device_id rt5677_spi_acpi_id[] = {

	{ "RT5677AA", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, rt5677_spi_acpi_id);

#endif



static struct spi_driver rt5677_spi_driver = {

	.driver = {