diff options
| -rw-r--r-- | drivers/gpu/drm/mxsfb/lcdif_drv.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index 8da8a265c05c..1c76709c4d94 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -63,10 +63,8 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) continue; ret = of_graph_parse_endpoint(ep, &of_ep); - if (ret < 0) { - dev_err(dev, "Failed to parse endpoint %pOF\n", ep); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to parse endpoint %pOF\n", ep); bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, of_ep.id); if (IS_ERR(bridge)) @@ -75,20 +73,18 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) of_ep.id); encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); - if (!encoder) { - dev_err(dev, "Failed to allocate encoder for endpoint%u\n", - of_ep.id); - return -ENOMEM; - } + if (!encoder) + return dev_err_probe(dev, -ENOMEM, + "Failed to allocate encoder for endpoint%u\n", + of_ep.id); encoder->possible_crtcs = drm_crtc_mask(&lcdif->crtc); ret = drm_encoder_init(lcdif->drm, encoder, &lcdif_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); - if (ret) { - dev_err(dev, "Failed to initialize encoder for endpoint%u: %d\n", - of_ep.id, ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to initialize encoder for endpoint%u\n", + of_ep.id); ret = drm_bridge_attach(encoder, bridge, NULL, 0); if (ret) |