]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: tegra: Fix -Wuninitialized in tegra210_amx_platform_probe()
authorNathan Chancellor <nathan@kernel.org>
Wed, 11 Oct 2023 20:21:51 +0000 (13:21 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 12 Oct 2023 12:04:55 +0000 (13:04 +0100)
Clang warns (or errors with CONFIG_WERROR=y):

  sound/soc/tegra/tegra210_amx.c:553:10: error: variable 'soc_data' is uninitialized when used here [-Werror,-Wuninitialized]
    553 |                                             soc_data->regmap_conf);
        |                                             ^~~~~~~~

A refactoring removed the initialization of this variable but its use
was not updated. Use the soc_data value in the amx variable to resolve
the warning and remove the soc_data variable, as it is now entirely
unused.

Closes: https://github.com/ClangBuiltLinux/linux/issues/1943
Fixes: 9958d85968ed ("ASoC: Use device_get_match_data()")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20231011-asoc-tegra-fix-uninit-soc_data-v1-1-0ef0ab44cf48@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/tegra210_amx.c

index dd1a2c77c6ea7ecc663bb4405a1afa13b5814c96..91e405909e0f47ce0aaa19c07279a53549397429 100644 (file)
@@ -535,7 +535,6 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev)
        struct tegra210_amx *amx;
        void __iomem *regs;
        int err;
-       struct tegra210_amx_soc_data *soc_data;
 
        amx = devm_kzalloc(dev, sizeof(*amx), GFP_KERNEL);
        if (!amx)
@@ -550,7 +549,7 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev)
                return PTR_ERR(regs);
 
        amx->regmap = devm_regmap_init_mmio(dev, regs,
-                                           soc_data->regmap_conf);
+                                           amx->soc_data->regmap_conf);
        if (IS_ERR(amx->regmap)) {
                dev_err(dev, "regmap init failed\n");
                return PTR_ERR(amx->regmap);