]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/bridge: ti-sn65dsi86: Improve probe errors with dev_err_probe()
authorDouglas Anderson <dianders@chromium.org>
Fri, 11 Jun 2021 17:17:46 +0000 (10:17 -0700)
committerDouglas Anderson <dianders@chromium.org>
Fri, 11 Jun 2021 19:31:52 +0000 (12:31 -0700)
As I was testing to make sure that the DEFER path worked well with my
patch series, I got tired of seeing this scary message in my logs just
because the panel needed to defer:
  [drm:ti_sn_bridge_probe] *ERROR* could not find any panel node

Let's use dev_err_probe() which nicely quiets this error and also
simplifies the code a tiny bit. We'll also update other places in the
file which can use dev_err_probe().

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210611101711.v10.10.I24bba069e63b1eea84443eef0c8535fd032a6311@changeid
drivers/gpu/drm/bridge/ti-sn65dsi86.c

index b544cbce7fdd827ad2fe39a40289ff1b627f1157..5d712c8c3c3bdcd8b06ef984b47c73dcc111dadb 100644 (file)
@@ -1305,10 +1305,9 @@ static int ti_sn_bridge_probe(struct auxiliary_device *adev,
        int ret;
 
        ret = drm_of_find_panel_or_bridge(np, 1, 0, &pdata->panel, NULL);
-       if (ret) {
-               DRM_ERROR("could not find any panel node\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&adev->dev, ret,
+                                    "could not find any panel node\n");
 
        ti_sn_bridge_parse_lanes(pdata, np);
 
@@ -1456,27 +1455,23 @@ static int ti_sn65dsi86_probe(struct i2c_client *client,
 
        pdata->regmap = devm_regmap_init_i2c(client,
                                             &ti_sn65dsi86_regmap_config);
-       if (IS_ERR(pdata->regmap)) {
-               DRM_ERROR("regmap i2c init failed\n");
-               return PTR_ERR(pdata->regmap);
-       }
+       if (IS_ERR(pdata->regmap))
+               return dev_err_probe(dev, PTR_ERR(pdata->regmap),
+                                    "regmap i2c init failed\n");
 
        pdata->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
-       if (IS_ERR(pdata->enable_gpio)) {
-               DRM_ERROR("failed to get enable gpio from DT\n");
-               ret = PTR_ERR(pdata->enable_gpio);
-               return ret;
-       }
+       if (IS_ERR(pdata->enable_gpio))
+               return dev_err_probe(dev, PTR_ERR(pdata->enable_gpio),
+                                    "failed to get enable gpio from DT\n");
 
        ret = ti_sn65dsi86_parse_regulators(pdata);
-       if (ret) {
-               DRM_ERROR("failed to parse regulators\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "failed to parse regulators\n");
 
        pdata->refclk = devm_clk_get_optional(dev, "refclk");
        if (IS_ERR(pdata->refclk))
-               return PTR_ERR(pdata->refclk);
+               return dev_err_probe(dev, PTR_ERR(pdata->refclk),
+                                    "failed to get reference clock\n");
 
        pm_runtime_enable(dev);
        ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev);