drm/vc4: simplify exit path of a failed allocation of dsi_connector

If dsi_connector fails to allocate, the exit path via label 'fail'
checks if connector is null, which it always is, so the cleanup
that destroys connector is never going to be called.  Hence the
failure path can be more optimally performed by removing this
and just returning ERR_PTR(-ENOMEM).  This also removes the need
to initialize connector to NULL, and we can also remove ret too.

Detected by CoverityScan, CID#1399504 ("Logicall Dead Code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170203195624.7189-1-colin.king@canonical.com
(cherry picked from commit fce6a7bc22114c69b071bcf6fbfea2d07de6273c)

diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index bdbc6d4041bd3584c497a8710f7c6c323dbdf80a..ce1fee81301b450aa832e145e191d2e702857cbe 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -771,16 +771,14 @@ static const struct drm_connector_helper_funcs vc4_dsi_connector_helper_funcs =
 static struct drm_connector *vc4_dsi_connector_init(struct drm_device *dev,
                                                    struct vc4_dsi *dsi)
 {
-       struct drm_connector *connector = NULL;
+       struct drm_connector *connector;
        struct vc4_dsi_connector *dsi_connector;
-       int ret = 0;
 
        dsi_connector = devm_kzalloc(dev->dev, sizeof(*dsi_connector),
                                     GFP_KERNEL);
-       if (!dsi_connector) {
-               ret = -ENOMEM;
-               goto fail;
-       }
+       if (!dsi_connector)
+               return ERR_PTR(-ENOMEM);
+
        connector = &dsi_connector->base;
 
        dsi_connector->dsi = dsi;
@@ -796,12 +794,6 @@ static struct drm_connector *vc4_dsi_connector_init(struct drm_device *dev,
        drm_mode_connector_attach_encoder(connector, dsi->encoder);
 
        return connector;
-
-fail:
-       if (connector)
-               vc4_dsi_connector_destroy(connector);
-
-       return ERR_PTR(ret);
 }
 
 static void vc4_dsi_encoder_destroy(struct drm_encoder *encoder)