From 9deca0ad10f290caa288dd03d109ecceffff464b Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 22 Mar 2021 11:06:21 +0100 Subject: [PATCH] PANELS TODO FINISHME: use dev_err_probe in _probe! --- .../gpu/drm/panel/panel-td4322-innolux-fhd.c | 29 +++++-------------- .../drm/panel/panel-td4328-tianma-fhdplus.c | 29 +++++-------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-td4322-innolux-fhd.c b/drivers/gpu/drm/panel/panel-td4322-innolux-fhd.c index 69a962cc106e..8959dfc00c40 100644 --- a/drivers/gpu/drm/panel/panel-td4322-innolux-fhd.c +++ b/drivers/gpu/drm/panel/panel-td4322-innolux-fhd.c @@ -195,17 +195,12 @@ static int td4322_innolux_fhd_probe(struct mipi_dsi_device *dsi) ctx->supplies[3].supply = "vsp"; ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies), ctx->supplies); - if (ret < 0) { - dev_err(dev, "Failed to get regulators: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get regulators\n"); ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ctx->reset_gpio)) { - ret = PTR_ERR(ctx->reset_gpio); - dev_err(dev, "Failed to get reset-gpios: %d\n", ret); - return ret; - } + if (IS_ERR(ctx->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio), "Failed to get reset-gpios\n"); ctx->dsi = dsi; mipi_dsi_set_drvdata(dsi, ctx); @@ -219,22 +214,14 @@ static int td4322_innolux_fhd_probe(struct mipi_dsi_device *dsi) DRM_MODE_CONNECTOR_DSI); ret = drm_panel_of_backlight(&ctx->panel); - if (ret) { - dev_err(dev, "Failed to get backlight: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to get backlight\n"); drm_panel_add(&ctx->panel); - if (ret < 0) { - dev_err(dev, "Failed to add panel: %d\n", ret); - return ret; - } ret = mipi_dsi_attach(dsi); - if (ret < 0) { - dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to attach to DSI host\n"); return 0; } diff --git a/drivers/gpu/drm/panel/panel-td4328-tianma-fhdplus.c b/drivers/gpu/drm/panel/panel-td4328-tianma-fhdplus.c index d1de8b549bd8..6a1ff6fdfa55 100644 --- a/drivers/gpu/drm/panel/panel-td4328-tianma-fhdplus.c +++ b/drivers/gpu/drm/panel/panel-td4328-tianma-fhdplus.c @@ -198,17 +198,12 @@ static int td4328_tianma_fhdplus_probe(struct mipi_dsi_device *dsi) ctx->supplies[3].supply = "vsp"; ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies), ctx->supplies); - if (ret < 0) { - dev_err(dev, "Failed to get regulators: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get regulators\n"); ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ctx->reset_gpio)) { - ret = PTR_ERR(ctx->reset_gpio); - dev_err(dev, "Failed to get reset-gpios: %d\n", ret); - return ret; - } + if (IS_ERR(ctx->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio), "Failed to get reset-gpios\n"); ctx->dsi = dsi; mipi_dsi_set_drvdata(dsi, ctx); @@ -222,22 +217,14 @@ static int td4328_tianma_fhdplus_probe(struct mipi_dsi_device *dsi) DRM_MODE_CONNECTOR_DSI); ret = drm_panel_of_backlight(&ctx->panel); - if (ret) { - dev_err(dev, "Failed to get backlight: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to get backlight\n"); drm_panel_add(&ctx->panel); - if (ret < 0) { - dev_err(dev, "Failed to add panel: %d\n", ret); - return ret; - } ret = mipi_dsi_attach(dsi); - if (ret < 0) { - dev_err(dev, "Failed to attach to DSI host: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to attach to DSI host\n"); return 0; }