Message ID | 20240719095640.3741247-1-arnd@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | a2d6d8aee4a4f694920bfaf6f6be3690e0f8d302 |
Headers | show |
Series | sound: hda: tas2781: mark const variables as __maybe_unused | expand |
On Fri, 19 Jul 2024 11:56:34 +0200, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > An earlier patch changed the DECLARE_TLV_DB_SCALE declaration, but > now there are additional static const variables that cause > the same build warnings: > > In file included from sound/pci/hda/tas2781_hda_i2c.c:23: > include/sound/tas2781-tlv.h:23:28: error: 'tas2563_dvc_table' defined but not used [-Werror=unused-const-variable=] > 23 | static const unsigned char tas2563_dvc_table[][4] = { > | ^~~~~~~~~~~~~~~~~ > In file included from include/sound/tlv.h:10, > from sound/pci/hda/tas2781_hda_i2c.c:22: > include/sound/tas2781-tlv.h:20:35: error: 'tas2563_dvc_tlv' defined but not used [-Werror=unused-const-variable=] > 20 | static const DECLARE_TLV_DB_SCALE(tas2563_dvc_tlv, -12150, 50, 1); > | ^~~~~~~~~~~~~~~ > > Mark them all as unused as well. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, applied now. Takashi
diff --git a/include/sound/tas2781-tlv.h b/include/sound/tas2781-tlv.h index 99c41bfc7827..00fd4d449ff3 100644 --- a/include/sound/tas2781-tlv.h +++ b/include/sound/tas2781-tlv.h @@ -16,11 +16,11 @@ #define __TAS2781_TLV_H__ static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); -static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); -static const DECLARE_TLV_DB_SCALE(tas2563_dvc_tlv, -12150, 50, 1); +static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0); +static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2563_dvc_tlv, -12150, 50, 1); /* pow(10, db/20) * pow(2,30) */ -static const unsigned char tas2563_dvc_table[][4] = { +static const __maybe_unused unsigned char tas2563_dvc_table[][4] = { { 0X00, 0X00, 0X00, 0X00 }, /* -121.5db */ { 0X00, 0X00, 0X03, 0XBC }, /* -121.0db */ { 0X00, 0X00, 0X03, 0XF5 }, /* -120.5db */