Skip to content

Commit b28d204

Browse files
Yuan Candianders
authored andcommitted
drm/panel: panel-edp: Use dev_err_probe() to simplify code
In the probe path, dev_err() can be replaced with dev_err_probe() which will check if error code is -EPROBE_DEFER and prints the error name. It also sets the defer probe reason which can be checked later through debugfs. Signed-off-by: Yuan Can <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Signed-off-by: Douglas Anderson <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b55002b commit b28d204

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

drivers/gpu/drm/panel/panel-edp.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -403,17 +403,10 @@ static int panel_edp_unprepare(struct drm_panel *panel)
403403

404404
static int panel_edp_get_hpd_gpio(struct device *dev, struct panel_edp *p)
405405
{
406-
int err;
407-
408406
p->hpd_gpio = devm_gpiod_get_optional(dev, "hpd", GPIOD_IN);
409-
if (IS_ERR(p->hpd_gpio)) {
410-
err = PTR_ERR(p->hpd_gpio);
411-
412-
if (err != -EPROBE_DEFER)
413-
dev_err(dev, "failed to get 'hpd' GPIO: %d\n", err);
414-
415-
return err;
416-
}
407+
if (IS_ERR(p->hpd_gpio))
408+
return dev_err_probe(dev, PTR_ERR(p->hpd_gpio),
409+
"failed to get 'hpd' GPIO\n");
417410

418411
return 0;
419412
}
@@ -832,12 +825,9 @@ static int panel_edp_probe(struct device *dev, const struct panel_desc *desc,
832825

833826
panel->enable_gpio = devm_gpiod_get_optional(dev, "enable",
834827
GPIOD_OUT_LOW);
835-
if (IS_ERR(panel->enable_gpio)) {
836-
err = PTR_ERR(panel->enable_gpio);
837-
if (err != -EPROBE_DEFER)
838-
dev_err(dev, "failed to request GPIO: %d\n", err);
839-
return err;
840-
}
828+
if (IS_ERR(panel->enable_gpio))
829+
return dev_err_probe(dev, PTR_ERR(panel->enable_gpio),
830+
"failed to request GPIO\n");
841831

842832
err = of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
843833
if (err) {

0 commit comments

Comments
 (0)