lcdif_attach_bridge() uses dev_err_probe() in some error paths, dev_err() + return in others. Use dev_err_probe() for all of them to make code consistent and simpler.
Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/mxsfb/lcdif_drv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/lcdif_drv.c b/drivers/gpu/drm/mxsfb/lcdif_drv.c index 83e134c04882..e40253ad607b 100644 --- a/drivers/gpu/drm/mxsfb/lcdif_drv.c +++ b/drivers/gpu/drm/mxsfb/lcdif_drv.c @@ -63,18 +63,14 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif) return dev_err_probe(dev, PTR_ERR(bridge), "Failed to get bridge\n"); encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); - if (!encoder) { - dev_err(dev, "Failed to allocate encoder\n"); - return -ENOMEM; - } + if (!encoder) + return dev_err_probe(dev, -ENOMEM, "Failed to allocate encoder\n"); 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: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize encoder\n"); ret = drm_bridge_attach(encoder, bridge, NULL, 0); if (ret) -- 2.53.0
