]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: samsung: midas_wm1811: Use dev_err_probe where appropriate
authorArtur Weber <aweber.kernel@gmail.com>
Sat, 25 May 2024 13:28:10 +0000 (15:28 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 29 May 2024 12:45:45 +0000 (13:45 +0100)
Since we're already using it in the newly-added GPIO requests for
jack detection, extend it to the previous checks as well.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://msgid.link/r/20240525-midas-wm1811-gpio-jack-v4-6-f488e03bd8c7@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/samsung/midas_wm1811.c

index 3a6d3fc8152a2dba09f97c53125057eb263ba3a6..3a269c7de1696043d7ecf354bf2abb201af53eba 100644 (file)
@@ -590,17 +590,15 @@ static int midas_probe(struct platform_device *pdev)
        card->dev = dev;
 
        priv->gpio_fm_sel = devm_gpiod_get_optional(dev, "fm-sel", GPIOD_OUT_HIGH);
-       if (IS_ERR(priv->gpio_fm_sel)) {
-               dev_err(dev, "Failed to get FM selection GPIO\n");
-               return PTR_ERR(priv->gpio_fm_sel);
-       }
+       if (IS_ERR(priv->gpio_fm_sel))
+               return dev_err_probe(dev, PTR_ERR(priv->gpio_fm_sel),
+                                    "Failed to get FM selection GPIO\n");
 
        priv->gpio_lineout_sel = devm_gpiod_get_optional(dev, "lineout-sel",
                                                    GPIOD_OUT_HIGH);
-       if (IS_ERR(priv->gpio_lineout_sel)) {
-               dev_err(dev, "Failed to get line out selection GPIO\n");
-               return PTR_ERR(priv->gpio_lineout_sel);
-       }
+       if (IS_ERR(priv->gpio_lineout_sel))
+               return dev_err_probe(dev, PTR_ERR(priv->gpio_lineout_sel),
+                                    "Failed to get line out selection GPIO\n");
 
        priv->gpio_headset_detect = devm_gpiod_get_optional(dev,
                                "headset-detect", GPIOD_IN);