This is a note to let you know that I've just added the patch titled
ASoC: Intel: fix unused-variable warning in probe_codec
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-intel-fix-unused-variable-warning-in-probe_codec.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 515626a33a194c4caaf2879dbf9e00e882582af0 Mon Sep 17 00:00:00 2001
From: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
Date: Mon, 22 Aug 2022 11:51:33 +0800
Subject: ASoC: Intel: fix unused-variable warning in probe_codec
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
commit 515626a33a194c4caaf2879dbf9e00e882582af0 upstream.
In configurations with CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=n,
gcc warns about an unused variable:
sound/soc/intel/skylake/skl.c: In function ‘probe_codec’:
sound/soc/intel/skylake/skl.c:729:18: error: unused variable ‘skl’ [-Werror=unused-variable]
struct skl_dev *skl = bus_to_skl(bus);
^~~
cc1: all warnings being treated as errors
Fixes: 3fd63658caed9 ("ASoC: Intel: Drop hdac_ext usage for codec device creation")
Signed-off-by: Gaosheng Cui <cuigaosheng1@xxxxxxxxxx>
Acked-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
Link: https://lore.kernel.org/r/20220822035133.2147381-1-cuigaosheng1@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/intel/skylake/skl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -726,8 +726,8 @@ static int probe_codec(struct hdac_bus *
unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |
(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
unsigned int res = -1;
- struct skl_dev *skl = bus_to_skl(bus);
#if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC)
+ struct skl_dev *skl = bus_to_skl(bus);
struct hdac_hda_priv *hda_codec;
#endif
struct hda_codec *codec;
Patches currently in stable-queue which might be from cuigaosheng1@xxxxxxxxxx are
queue-6.0/audit-fix-undefined-behavior-in-bit-shift-for-audit_.patch
queue-6.0/asoc-intel-fix-unused-variable-warning-in-probe_codec.patch
