diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-09 22:20:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-09 22:20:32 +0100 |
| commit | a834238961bcaf1f9e6623b8022177d0f9b86e8d (patch) | |
| tree | 19a45150b4962b4eede1ed7481dac357c5259e3b /sound/soc/codecs/rt274.c | |
| parent | 3e146b55a4f5213b5da0f243813efb380fa7f84d (diff) | |
| parent | 56bbfbfdab2b79d3b6e370750358702a7aa079ed (diff) | |
| download | linux-a834238961bcaf1f9e6623b8022177d0f9b86e8d.tar.bz2 | |
Merge series "ASoC: Clean-up W=1 build warnings - part1" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Both Lee Jones and I submitted separate series, this is the first part
of the merged result, which includes all previously reviewed patches
or suggested changes along with trivial ones for CONFIG_ACPI.
Lee Jones (2):
ASoC: codecs: jz4770: Remove defined but never used variable
'mic_boost_tlv'
ASoC: ti: omap-mcbsp-st: Remove set, but unused variable 'w'
Pierre-Louis Bossart (11):
ASoC: atmel: fix kernel-doc
ASoC: samsung: spdif: fix kernel-doc
ASoC: samsung: pcm: fix kernel-doc
ASoC: tegra: tegra20_das: remove always-true comparison
ASoC: uniphier: aio-core: fix kernel-doc
ASoC: codecs: da7210: fix kernel-doc
ASoC: codecs: da7219: fix 'defined but not used' warning
ASoC: codecs: cros_ec_codec: fix 'defined but not used' warning
ASoC: codecs: es8316: fix 'defined but not used' warning
ASoC: codecs: max98390: fix 'defined but not used' warning
ASoC: codecs: rt*: fix 'defined but not used' warning
sound/soc/atmel/atmel-pcm-dma.c | 2 +-
sound/soc/atmel/atmel_ssc_dai.c | 1 +
sound/soc/codecs/cros_ec_codec.c | 2 ++
sound/soc/codecs/da7210.c | 12 +++++++-----
sound/soc/codecs/da7219.c | 2 ++
sound/soc/codecs/es8316.c | 2 ++
sound/soc/codecs/jz4770.c | 1 -
sound/soc/codecs/max98390.c | 8 --------
sound/soc/codecs/rt274.c | 2 ++
sound/soc/codecs/rt286.c | 2 ++
sound/soc/codecs/rt298.c | 2 ++
sound/soc/codecs/rt5660.c | 2 ++
sound/soc/codecs/rt5677-spi.c | 2 ++
sound/soc/samsung/pcm.c | 5 +++++
sound/soc/samsung/spdif.c | 6 +++---
sound/soc/tegra/tegra20_das.c | 3 +--
sound/soc/ti/omap-mcbsp-st.c | 3 ---
sound/soc/uniphier/aio-core.c | 7 +++----
18 files changed, 37 insertions(+), 27 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/codecs/rt274.c')
| -rw-r--r-- | sound/soc/codecs/rt274.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c index 923b8f919189..70cf17c0aa99 100644 --- a/sound/soc/codecs/rt274.c +++ b/sound/soc/codecs/rt274.c @@ -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) |