From mboxrd@z Thu Jan 1 00:00:00 1970 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 49701CD4F57 for ; Mon, 18 May 2026 19:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kjTG1Ak+F+PLmCEEhmKg5bB7H85Hff4CbMbJgrGq+P0=; b=ec0AQgObhoNAOB6OUrGY4PNeiz NutWr3JN3GQrm9jPZinIDg1aQvl3Ir1hjxv6nEj++NaBFEcrtKSw+HWdxcirZEgutuRhe3DZz8uiF pcO/StrWofzvCwNY+sOEBk2iumb+uER+FpyZbANP/Y5RrHCBDT1v8WUfctTskS2s5e9qpvVY84beb QIGvqQXI1Ld7j5rWGCUMC0jamwb9G7XvHFYt/lQ+UUAnUENWbH8k7zGcY3BBl4x4yIfUkmJOPNI+q wIqoNrEs3YPUbmTpBOBsDA8jluH/dsIOjQOAQcsNk4pjkqKX3PHbfAsTbqG1toOsPQB4FUntUFmbI DHcd4RDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wP3x4-0000000GliY-1Uea; Mon, 18 May 2026 19:48:34 +0000 Received: from smtp.forwardemail.net ([149.28.215.223]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wP3wz-0000000Glbk-2sZ7 for linux-arm-kernel@lists.infradead.org; Mon, 18 May 2026 19:48:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1779133709; bh=kjTG1Ak+F+PLmCEEhmKg5bB7H85Hff4CbMbJgrGq+P0=; b=VIMjGkStZ1C1Mj+NqYyJW+cDI2Yqc8Yc9969L232HHQuNnxAA2G/PlYK5sa1GDaYQpMEyD7mC C9O1GHloK3pmgfdxgiWRtc7FktrbjKAUlJAnkVUx3ccMPzfwCT6xFw/rd/okUJ9hrdmKzRX/YSq OSBUFzipgLJojC0G8A1EzN9DpsraoRETxAZI0gzzaLrOZQm1ZPDgHx5EQrhtCwLVNIPjhlQG5zt r/NOgcDTHrSsaXNRPidC1xzPhHFcMeFtcGlilZ0t7D7UQk5BMpmiLHZtRkz1HhuP5DOJJCGpPGY rpAp231A0PwPo1FnB2bATQ+md35u7KJfCZ09f0J9+TGw== X-Forward-Email-ID: 6a0b6cf5b74b0ebd362eee56 X-Forward-Email-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-Forward-Email-Version: 2.8.12 X-Forward-Email-Website: https://forwardemail.net X-Complaints-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Report-Abuse-To: abuse@forwardemail.net From: Jonas Karlman To: Neil Armstrong , Kevin Hilman , Heiko Stuebner , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jerome Brunet , Martin Blumenstingl Cc: dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman , linux-rockchip@lists.infradead.org Subject: [PATCH 03/13] drm/meson: dw-hdmi: Call dw_hdmi_remove() consistently Date: Mon, 18 May 2026 19:47:31 +0000 Message-ID: <20260518194744.2483580-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260518194744.2483580-1-jonas@kwiboo.se> References: <20260518194744.2483580-1-jonas@kwiboo.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260518_124829_732915_2A00A2B8 X-CRM114-Status: GOOD ( 11.88 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org dw-hdmi export two similar pair of functions to probe()/remove() and bind()/unbind(), update to use dw_hdmi_remove() for consistency. dw_hdmi_probe() will drm_bridge_add() the dw-hdmi bridge, so it is expected that of_drm_find_and_get_bridge() always return the dw-hdmi bridge. Regardless, validate that the dw-hdmi can be found for consistent error handling. Also always ensure the IRQ handler and bridge is released before dw_hdmi_remove() is called. Signed-off-by: Jonas Karlman --- drivers/gpu/drm/meson/meson_dw_hdmi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index eafe7daf6ff1..9aafdc768f2b 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -775,10 +775,17 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, platform_set_drvdata(pdev, meson_dw_hdmi); meson_dw_hdmi->hdmi = dw_hdmi_probe(pdev, &meson_dw_hdmi->dw_plat_data); - if (IS_ERR(meson_dw_hdmi->hdmi)) + if (IS_ERR(meson_dw_hdmi->hdmi)) { + devm_free_irq(dev, irq, meson_dw_hdmi); return PTR_ERR(meson_dw_hdmi->hdmi); + } meson_dw_hdmi->bridge = of_drm_find_and_get_bridge(pdev->dev.of_node); + if (!meson_dw_hdmi->bridge) { + devm_free_irq(dev, irq, meson_dw_hdmi); + dw_hdmi_remove(meson_dw_hdmi->hdmi); + return -ENODEV; + } DRM_DEBUG_DRIVER("HDMI controller initialized\n"); @@ -793,8 +800,8 @@ static void meson_dw_hdmi_unbind(struct device *dev, struct device *master, int irq = platform_get_irq(pdev, 0); devm_free_irq(dev, irq, meson_dw_hdmi); - dw_hdmi_unbind(meson_dw_hdmi->hdmi); drm_bridge_put(meson_dw_hdmi->bridge); + dw_hdmi_remove(meson_dw_hdmi->hdmi); } static const struct component_ops meson_dw_hdmi_ops = { -- 2.54.0