Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
From:   Maxime Ripard <maxime@cerno.tech>
To:     Maxime Ripard <mripard@kernel.org>,
        Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>, Chen-Yu Tsai <wens@csie.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Lyude Paul <lyude@redhat.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Samuel Holland <samuel@sholland.org>,
        Karol Herbst <kherbst@redhat.com>,
        =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>,
        Emma Anholt <emma@anholt.net>, Daniel Vetter <daniel@ffwll.ch>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc:     Maxime Ripard <maxime@cerno.tech>,
        Hans de Goede <hdegoede@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Phil Elwell <phil@raspberrypi.com>,
        intel-gfx@lists.freedesktop.org,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        dri-devel@lists.freedesktop.org, Dom Cobley <dom@raspberrypi.com>,
        linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org,
        linux-sunxi@lists.linux.dev,
        Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 39/41] drm/sun4i: tv: Rename error label
Date:   Mon, 29 Aug 2022 15:11:53 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-39-459522d653a7@cerno.tech>
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The other error labels in sun4i_tv_bind() are named after the task they=0D
perform (err_disable_clk to call clk_disable_unprepare for example).=0D
=0D
However, the err_cleanup_connector is named after the calling site=0D
(drm_connector_init failing) and will actually cleanup the encoder. Let's=0D
rename it to err_cleanup_encoder to be consistent.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>=0D
=0D
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i=
_tv.c=0D
index 6d7e1d51569a..ad6a3739bfa9 100644=0D
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c=0D
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c=0D
@@ -580,7 +580,7 @@ static int sun4i_tv_bind(struct device *dev, struct dev=
ice *master,=0D
 	if (ret) {=0D
 		dev_err(dev,=0D
 			"Couldn't initialise the Composite connector\n");=0D
-		goto err_cleanup_connector;=0D
+		goto err_cleanup_encoder;=0D
 	}=0D
 	tv->connector.interlace_allowed =3D true;=0D
 =0D
@@ -588,7 +588,7 @@ static int sun4i_tv_bind(struct device *dev, struct dev=
ice *master,=0D
 =0D
 	return 0;=0D
 =0D
-err_cleanup_connector:=0D
+err_cleanup_encoder:=0D
 	drm_encoder_cleanup(&tv->encoder);=0D
 err_disable_clk:=0D
 	clk_disable_unprepare(tv->clk);=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D