Commit dfb64090 authored by Guido Günther's avatar Guido Günther

drm/panel: st7703: Use dev_err_probe

Less code and easier probe deferral debugging.
Signed-off-by: default avatarGuido Günther <agx@sigxcpu.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/36405038d93eb148f3e8ed8e5ea70de8e87afd78.1605688147.git.agx@sigxcpu.org
parent a3d0d834
...@@ -530,10 +530,8 @@ static int st7703_probe(struct mipi_dsi_device *dsi) ...@@ -530,10 +530,8 @@ static int st7703_probe(struct mipi_dsi_device *dsi)
return -ENOMEM; return -ENOMEM;
ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ctx->reset_gpio)) { if (IS_ERR(ctx->reset_gpio))
dev_err(dev, "cannot get reset gpio\n"); return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio), "Failed to get reset gpio\n");
return PTR_ERR(ctx->reset_gpio);
}
mipi_dsi_set_drvdata(dsi, ctx); mipi_dsi_set_drvdata(dsi, ctx);
...@@ -545,19 +543,13 @@ static int st7703_probe(struct mipi_dsi_device *dsi) ...@@ -545,19 +543,13 @@ static int st7703_probe(struct mipi_dsi_device *dsi)
dsi->lanes = ctx->desc->lanes; dsi->lanes = ctx->desc->lanes;
ctx->vcc = devm_regulator_get(dev, "vcc"); ctx->vcc = devm_regulator_get(dev, "vcc");
if (IS_ERR(ctx->vcc)) { if (IS_ERR(ctx->vcc))
ret = PTR_ERR(ctx->vcc); return dev_err_probe(dev, PTR_ERR(ctx->vcc), "Failed to request vcc regulator\n");
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to request vcc regulator: %d\n", ret);
return ret;
}
ctx->iovcc = devm_regulator_get(dev, "iovcc"); ctx->iovcc = devm_regulator_get(dev, "iovcc");
if (IS_ERR(ctx->iovcc)) { if (IS_ERR(ctx->iovcc))
ret = PTR_ERR(ctx->iovcc); return dev_err_probe(dev, PTR_ERR(ctx->iovcc),
if (ret != -EPROBE_DEFER) "Failed to request iovcc regulator\n");
dev_err(dev, "Failed to request iovcc regulator: %d\n", ret);
return ret;
}
drm_panel_init(&ctx->panel, dev, &st7703_drm_funcs, drm_panel_init(&ctx->panel, dev, &st7703_drm_funcs,
DRM_MODE_CONNECTOR_DSI); DRM_MODE_CONNECTOR_DSI);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment