Unverified Commit bc9b1eba authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: tas2781: fix unused-const-variable warning 



When both CONFIG_OF and CONFIG_ACPI are disabled, the ID table is not
referenced any more:

sound/soc/codecs/tas2781-i2c.c:102:35: error: 'tasdevice_id' defined but not used [-Werror=unused-const-variable=]
  102 | static const struct i2c_device_id tasdevice_id[] = {
      |                                   ^~~~~~~~~~~~

Remove the #ifdef checks and just include the ID tables unconditionally
to get a clean build in all configurations. The code already uses
IS_ENABLED() checks for both to benefit from dead code elimination
and the ID tables are small enough that they can just be included
all the time.

Fixes: 9a52d1b7 ("ASoC: tas2781: Explicit association of Device, Device Name, and Device ID")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20260413070059.3828364-1-arnd@kernel.org


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

sound/soc/codecs/tas2781-i2c.c

+2 −8
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ static const struct i2c_device_id tasdevice_id[] = { 
	{}

};



#ifdef CONFIG_OF

static const struct of_device_id tasdevice_of_match[] = {

	{ .compatible = "ti,tas2020", .data = &tasdevice_id[TAS2020] },

	{ .compatible = "ti,tas2118", .data = &tasdevice_id[TAS2118] },
@@ -146,7 +145,6 @@ static const struct of_device_id tasdevice_of_match[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, tasdevice_of_match);

#endif



/**

 * tas2781_digital_getvol - get the volum control
@@ -2083,7 +2081,6 @@ static void tasdevice_i2c_remove(struct i2c_client *client) 
	tasdevice_remove(tas_priv);

}



#ifdef CONFIG_ACPI

static const struct acpi_device_id tasdevice_acpi_match[] = {

	{ "TXNW2020", (kernel_ulong_t)&tasdevice_id[TAS2020] },

	{ "TXNW2118", (kernel_ulong_t)&tasdevice_id[TAS2118] },
@@ -2108,15 +2105,12 @@ static const struct acpi_device_id tasdevice_acpi_match[] = { 
};



MODULE_DEVICE_TABLE(acpi, tasdevice_acpi_match);

#endif



static struct i2c_driver tasdevice_i2c_driver = {

	.driver = {

		.name = "tasdev-codec",

		.of_match_table = of_match_ptr(tasdevice_of_match),

#ifdef CONFIG_ACPI

		.acpi_match_table = ACPI_PTR(tasdevice_acpi_match),

#endif

		.of_match_table = tasdevice_of_match,

		.acpi_match_table = tasdevice_acpi_match,

	},

	.probe	= tasdevice_i2c_probe,

	.remove = tasdevice_i2c_remove,