OSDN Git Service

drm/sun4i: tv: Rename error label
authorMaxime Ripard <maxime@cerno.tech>
Mon, 29 Aug 2022 13:11:53 +0000 (15:11 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Wed, 7 Sep 2022 08:30:41 +0000 (10:30 +0200)
The other error labels in sun4i_tv_bind() are named after the task they
perform (err_disable_clk to call clk_disable_unprepare for example).

However, the err_cleanup_connector is named after the calling site
(drm_connector_init failing) and will actually cleanup the encoder. Let's
rename it to err_cleanup_encoder to be consistent.

Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220728-rpi-analog-tv-properties-v2-39-459522d653a7@cerno.tech
drivers/gpu/drm/sun4i/sun4i_tv.c

index 7823ac8..d3bf8fb 100644 (file)
@@ -585,7 +585,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
        if (ret) {
                dev_err(dev,
                        "Couldn't initialise the Composite connector\n");
-               goto err_cleanup_connector;
+               goto err_cleanup_encoder;
        }
        tv->connector.interlace_allowed = true;
 
@@ -593,7 +593,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
 
        return 0;
 
-err_cleanup_connector:
+err_cleanup_encoder:
        drm_encoder_cleanup(&tv->encoder);
 err_disable_clk:
        clk_disable_unprepare(tv->clk);