]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: codecs: wsa881x: Simplify &pdev->dev in probe
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 21 Jan 2026 02:04:21 +0000 (21:04 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Feb 2026 15:44:21 +0000 (16:44 +0100)
[ Upstream commit c617c9e7024d152426acf9f1aaf01070b6852f13 ]

The probe already stores pointer to &pdev->dev, so use it to make the
code a bit easier to read.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230102114152.297305-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 29d71b8a5a40 ("ASoC: codecs: wsa881x: fix unnecessary initialisation")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/wsa881x.c

index 054da9d2776cdc69a83b0ba06efb0dc3fbe81a9f..4ff53ab1274670a5c54ca81a709565db45b0827e 100644 (file)
@@ -1112,20 +1112,20 @@ static int wsa881x_probe(struct sdw_slave *pdev,
        struct wsa881x_priv *wsa881x;
        struct device *dev = &pdev->dev;
 
-       wsa881x = devm_kzalloc(&pdev->dev, sizeof(*wsa881x), GFP_KERNEL);
+       wsa881x = devm_kzalloc(dev, sizeof(*wsa881x), GFP_KERNEL);
        if (!wsa881x)
                return -ENOMEM;
 
-       wsa881x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown",
+       wsa881x->sd_n = devm_gpiod_get_optional(dev, "powerdown",
                                                GPIOD_FLAGS_BIT_NONEXCLUSIVE);
        if (IS_ERR(wsa881x->sd_n)) {
                dev_err(&pdev->dev, "Shutdown Control GPIO not found\n");
                return PTR_ERR(wsa881x->sd_n);
        }
 
-       dev_set_drvdata(&pdev->dev, wsa881x);
+       dev_set_drvdata(dev, wsa881x);
        wsa881x->slave = pdev;
-       wsa881x->dev = &pdev->dev;
+       wsa881x->dev = dev;
        wsa881x->sconfig.ch_count = 1;
        wsa881x->sconfig.bps = 1;
        wsa881x->sconfig.frame_rate = 48000;
@@ -1148,7 +1148,7 @@ static int wsa881x_probe(struct sdw_slave *pdev,
        pm_runtime_set_active(dev);
        pm_runtime_enable(dev);
 
-       return devm_snd_soc_register_component(&pdev->dev,
+       return devm_snd_soc_register_component(dev,
                                               &wsa881x_component_drv,
                                               wsa881x_dais,
                                               ARRAY_SIZE(wsa881x_dais));