From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F4A7379979 for ; Mon, 18 May 2026 19:48:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=149.28.215.223 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779133722; cv=none; b=ERc2EvTmlvSq+Gx9a1s46rXdHi2bOThwMzEiNbwAaRWYg+vOUs0U840XLMAw/0XHcqFoiCDtjax8vBpUgb/3dgH++0Y/apqM9TOGZz+7ZDvzl04kHYYA7srChBiGNtHNo9XCZwzUxEduC8VO07JnhSbDYZYBmf4AblYJvMG97Tg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779133722; c=relaxed/simple; bh=e2xdZXb2vPKVmjvj5PyOIWuEneSAJDmNwneWH7CZ2r4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Li8bbbk7lSO1hfE8OKxyQpYVoezmnLX2ZhxNeS7EAi9HiC20Ej80xFfPPDRLMNVJcV41Rd0aBNGU8AFGiv3VbFVzYIPuUFARNiMnPM+wldnHEgtqUX7se/65HmTUH9oc414O5r2bqscVTzQeZT5e4sFtJXNle0F9DvRztv4yxfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kwiboo.se; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b=JL1IbWKB; arc=none smtp.client-ip=149.28.215.223 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kwiboo.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fe-bounces.kwiboo.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="JL1IbWKB" 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=1779133717; bh=kjTG1Ak+F+PLmCEEhmKg5bB7H85Hff4CbMbJgrGq+P0=; b=JL1IbWKBC2IpUU3XC3b5plq+CfGXDAygVvEACillJbfu3HoV0h0VBkhNP0N9MPs/jqtGL7vu7 cpVxvjj7qoQApjfgrbyt/7zAS79VkWmi0nlBnTvIbotZC0uhIhJZ9zasWEhcn/UIO77fJr+FrZQ NfCNLishXtCCT0HETNUL4Eo3/NNCbx47zqG0AZFVyFvGKeJ3QO7Wi5pelwW1vrwKPkXwpKpfJPD pvtcuGv2i++5Qx2R5XPiOFzfmuwJirHJynAvDeMQDaOPFvm/nw+Wj71LC8+m91yuwm2qghKdJe3 GkKYzHPwyOg63xxlYT+WC1LwgfS43sV8o4M/frbxxy2Q== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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