Skip to content

Commit

Permalink
drm/vc4: clean up error exit path on failed dpi_connector allocation
Browse files Browse the repository at this point in the history
There is redundant code in the clean up exit path when dpi_connector
fails to be allocated.  The current code checks if connector is NULL
before destroying it, in fact, connector is NULL at this point so
the check is redundant and can be removed. The final clean up is
that we can remove the goto fail with a simple return and the unused
variable ret.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
  • Loading branch information
Colin Ian King authored and Eric Anholt committed Jun 6, 2016
1 parent 1a695a9 commit a9402df
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/gpu/drm/vc4/vc4_dpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,12 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
{
struct drm_connector *connector = NULL;
struct vc4_dpi_connector *dpi_connector;
int ret = 0;

dpi_connector = devm_kzalloc(dev->dev, sizeof(*dpi_connector),
GFP_KERNEL);
if (!dpi_connector) {
ret = -ENOMEM;
goto fail;
}
if (!dpi_connector)
return ERR_PTR(-ENOMEM);

connector = &dpi_connector->base;

dpi_connector->encoder = dpi->encoder;
Expand All @@ -260,12 +258,6 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
drm_mode_connector_attach_encoder(connector, dpi->encoder);

return connector;

fail:
if (connector)
vc4_dpi_connector_destroy(connector);

return ERR_PTR(ret);
}

static const struct drm_encoder_funcs vc4_dpi_encoder_funcs = {
Expand Down

0 comments on commit a9402df

Please sign in to comment.