Commit a9402dfe authored by Colin Ian King's avatar Colin Ian King Committed by Eric Anholt

drm/vc4: clean up error exit path on failed dpi_connector allocation

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: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
parent 1a695a90
...@@ -236,14 +236,12 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev, ...@@ -236,14 +236,12 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
{ {
struct drm_connector *connector = NULL; struct drm_connector *connector = NULL;
struct vc4_dpi_connector *dpi_connector; struct vc4_dpi_connector *dpi_connector;
int ret = 0;
dpi_connector = devm_kzalloc(dev->dev, sizeof(*dpi_connector), dpi_connector = devm_kzalloc(dev->dev, sizeof(*dpi_connector),
GFP_KERNEL); GFP_KERNEL);
if (!dpi_connector) { if (!dpi_connector)
ret = -ENOMEM; return ERR_PTR(-ENOMEM);
goto fail;
}
connector = &dpi_connector->base; connector = &dpi_connector->base;
dpi_connector->encoder = dpi->encoder; dpi_connector->encoder = dpi->encoder;
...@@ -260,12 +258,6 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev, ...@@ -260,12 +258,6 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
drm_mode_connector_attach_encoder(connector, dpi->encoder); drm_mode_connector_attach_encoder(connector, dpi->encoder);
return connector; return connector;
fail:
if (connector)
vc4_dpi_connector_destroy(connector);
return ERR_PTR(ret);
} }
static const struct drm_encoder_funcs vc4_dpi_encoder_funcs = { static const struct drm_encoder_funcs vc4_dpi_encoder_funcs = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment