From patchwork Fri Jul 29 16:35:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12932727 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59265C00144 for ; Fri, 29 Jul 2022 17:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HCQaPzaA2cwI+hXV/hE2fhGP/Nfo214D+nQfntyxW3w=; b=3fHj3a1Y51MqRv SC9Og0LKgUyjToKnTmeAetwHHbcNE9OuzaW6oZjFFlT1sC+8UFljPZsY41YjcCsSNNTzkU5RM1Nu7 P9tMlJ7DjWINBAQjS7SxHGEtZ9h7tgwGbx5UoiWeEZtZ6NxO/eRQNZKWicRmqPox6g2ajDkOnZh1T 4226cxtD9h3r9P1TeoqGRR0/8YftO+zXdtfCT0R7ACCr+zMP2BBGctbW4CZXzjOVa/ICxB5upJ4ag 6VFQpgY8D5rnJJojwXmmOML0oMfipQKyv15AI1WH1UStvdCEzEuTz/ebOEOgsPGHT2QyggypAQakh TA1yQYVCqeHUuMEuM7Nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHTfU-007kCJ-8Z; Fri, 29 Jul 2022 17:20:56 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHSzH-006Sz0-JG; Fri, 29 Jul 2022 16:37:22 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id BF8A9580993; Fri, 29 Jul 2022 12:37:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 29 Jul 2022 12:37:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1659112638; x= 1659119838; bh=DRj0o8o77hO3EzoMp5SRtKxDnHiE4KTCCM8ByWQjBPA=; b=d +1SsrAbv4kBuNb/ABYMfTZZ4Z3x1HCQ0ubMEXeZ5ddjHEUtXOqC/7ls1nlSqsttP XOhMkxmK+VvnKtuFgswgbQgehpQhZNNbljIGUu3+Dj4XlZvx6A+wHh3MN2iO1+S0 Z7pXqOjg/w34ViXEFsDKIdY/ba2ieh8n+T0BKEmcZS3elp2rhIXii2zXNpJtWHYu CYpyIJ9fRuHJONMgVn1C1nW7yj6EqqpKCCdngxu0Pdi3OwmgsEakj/mQgzvDhyKU 92jEXQQu/pnxVtFjA/9Mb+weJgjn3kVDxAyd21Q9abjMzmOdk7/1/+dXk08Ud4ZJ NXrMBYXeTae/UuQghPNEw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1659112638; x= 1659119838; bh=DRj0o8o77hO3EzoMp5SRtKxDnHiE4KTCCM8ByWQjBPA=; b=z 9ri8Sp2zO/Zw11o+M6bfROinlpV914iO3kPypC/CRgp94JA560+Ou6r/6YbB2aTs 6FOl+hjTnBrDUUmo0Fuls3OSq0VdAFWPiT+kZuAQJZipHvyILvi2asnfzR8tJXlp KVR3+/I5Y+InlKTGBoVuiLP1iZPYnv8wZoL/kaVORySQfoj23XDBgD69DeylTUej MrlaBvFjg338/KQhxkA9SATPFk7Ne94au5YZUo+AsGfqPw6/y6Vwq5iUyY1hMjDZ oU6wtA2OE1YIug32w4BsVIUn1CuF0BxxWKfu7T4K4mN5POn24FfMuSWBxDJB0uKZ sBLrKARTTcRmsxlw2y+Hw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddujedguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfgggtoffgsehtkeertdertdejnecuhfhrohhmpefo rgigihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecugg ftrfgrthhtvghrnhepgfffgfetffduudelhfevieffffduleevgfegkeeutefgffejheel leekjeefhfejnecuvehluhhsthgvrhfuihiivgepjeenucfrrghrrghmpehmrghilhhfrh homhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Jul 2022 12:37:17 -0400 (EDT) From: Maxime Ripard To: Jernej Skrabec , Martin Blumenstingl , Chen-Yu Tsai , Philipp Zabel , Jerome Brunet , Samuel Holland , Thomas Zimmermann , Daniel Vetter , Emma Anholt , David Airlie , Maarten Lankhorst , =?utf-8?q?Noralf_Tr?= =?utf-8?q?=C3=B8nnes?= , Kevin Hilman , Neil Armstrong , Maxime Ripard Cc: Maxime Ripard , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Phil Elwell , Mateusz Kwiatkowski , linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven , Dave Stevenson , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Dom Cobley Subject: [PATCH v1 30/35] drm/sun4i: tv: Rename error label Date: Fri, 29 Jul 2022 18:35:13 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v1-30-3d53ae722097@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> References: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-49460 X-Developer-Signature: v=1; a=openpgp-sha256; l=1161; i=maxime@cerno.tech; h=from:subject:message-id; bh=T/yE0DYpsTv+6dkw5jRLTwJsI3mGSn03diR5FyZB77w=; b=owGbwMvMwCHc4XzqmfnC7acZT6slMSQ94VHi+dgkYH09OSfiepjZqc/Pzi+QKdr2bUfHU4HobV+U pS5f6ShlYRDmYJAVU2S5LvjWji8syi2C58NmmDmsTCBDGLg4BWAiqWyMDFPfVD9lWvn3R3Xew4YHa9 Z3LGp8uGXXfQ8jbv11dcu2vT/P8IfHZ3nDjUPTZj3bGOvf8bo2f57qxL+/zD4r6j1RjLp0vdEHAA== X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220729_093719_800052_A3142EDF X-CRM114-Status: UNSURE ( 6.63 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org 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. Signed-off-by: Maxime Ripard Reviewed-by: Jernej Skrabec diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index 6d7e1d51569a..ad6a3739bfa9 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -580,7 +580,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; @@ -588,7 +588,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);