diff options
| author |   Mark Brown <broonie@kernel.org> | 2024-04-03 18:56:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-03 18:56:57 +0100 |
| commit | b9cfeeb9b0144ca53893e3fc2691a19f0d0e308b (patch) | |
| tree | c7b5cd71c9899bb39f516a7db480fdfcb103e986 | |
| parent | ASoC: SOF: Intel: mtl/lnl: Improve firmware boot state (diff) | |
| parent | ASoC: codecs: rk3308: depend on ARM64 || COMPILE_TEST (diff) | |
| download | wireguard-linux-b9cfeeb9b0144ca53893e3fc2691a19f0d0e308b.tar.xz wireguard-linux-b9cfeeb9b0144ca53893e3fc2691a19f0d0e308b.zip | |
ASoC: codecs: rk3308: fix build warning without OF
Merge series from Luca Ceresoli <luca.ceresoli@bootlin.com>:
This small series fixes a build warning reported by kernel test robot
<lkp@intel.com> and improves the Kconfig entry.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
Changes in v2:
- Replaced v1 implementation with __maybe_unused
- Added patch to depend on || COMPILE_TEST
- Link to v1: https://lore.kernel.org/r/20240329-rk3308-audio-codec-fix-warning-v1-1-b9d177fcd6c9@bootlin.com
---
Luca Ceresoli (2):
ASoC: codecs: rk3308: fix "defined but not used" warning on !OF
ASoC: codecs: rk3308: depend on ARM64 || COMPILE_TEST
sound/soc/codecs/Kconfig | 1 +
sound/soc/codecs/rk3308_codec.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
base-commit: 4ed0915f5bc4bcc81bca783a5b984f3d81e9764e
change-id: 20240329-rk3308-audio-codec-fix-warning-51bb572ebd96
Best regards,
--
Luca Ceresoli <luca.ceresoli@bootlin.com>
| -rw-r--r-- | sound/soc/codecs/Kconfig | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/rk3308_codec.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1752814fffdd..4e47bb6850aa 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1436,6 +1436,7 @@ config SND_SOC_PEB2466 config SND_SOC_RK3308 tristate "Rockchip RK3308 audio CODEC" + depends on ARM64 || COMPILE_TEST select REGMAP_MMIO help This is a device driver for the audio codec embedded in the diff --git a/sound/soc/codecs/rk3308_codec.c b/sound/soc/codecs/rk3308_codec.c index 9d3e4691a7b5..74c3836995b1 100644 --- a/sound/soc/codecs/rk3308_codec.c +++ b/sound/soc/codecs/rk3308_codec.c @@ -953,7 +953,7 @@ static int rk3308_codec_platform_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id rk3308_codec_of_match[] = { +static const struct of_device_id __maybe_unused rk3308_codec_of_match[] = { { .compatible = "rockchip,rk3308-codec", }, {}, }; |