From patchwork Tue Dec 17 15:43:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 13912136 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 5D8B7E7717F for ; Tue, 17 Dec 2024 16:10:37 +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=n5hW6szwf2itoOiYj9uhWXt4yegXL8/oZeOEhWXGeRM=; b=ezLuF4me02hON84CZoe7FE9Vpy yz3NYyds8Y3OQKK0KDxda3huDShumFMoqK2yZzHSc3IG3xZHqnpr4QlOhtcE5lj6DSCnjEcgwePet DT3In3lc+fETwRr46aEmYDCXFJbPQTdRMpnPhngZwODS7JlY9Ckxf/6k2RPT77jX1XdIvK/tYLVq4 DGNQtYwQIwpDwtWjBbojxVwDLVzIGNzlhwYM6STN7DZyCWCyD34TwrEINIC3w4aqp0BY39aPydP+N s0/xPIUdCjOk1GBjp46QmnHR77qr3Izehd8mA+SmpHN2As9mycM/ywfu4ZMwiqRsHHfXO4BSkuV2G mBI4pzfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tNa9c-0000000E6Zo-1mSA; Tue, 17 Dec 2024 16:10:36 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tNZkH-0000000E084-0JPN; Tue, 17 Dec 2024 15:44:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1734450263; bh=0p0IXEd2fkgLDSgY6EoCVjmZxOOmdUnvxWTxBaH6WFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KmJBS7PwWG9TOhb42rJtkBFGP/ahb5CO+A1Z33I/M3WVG55oYZtYGkYllg+wyPG20 B8a8oP9jfwvCS7zviPpoK+7cZL5qkouy1Ee9yCrtIdAtt3E1Hm62ww2hFzQTTvY7EI /wtu+X32VFGcdpUfKyI13l0Ce4aHQUtWYjNvnCie22g/i7A6SbBWcgneHfEXo3rxHH Lzq1CHhEpF93+S/gS/6/GyROoAdQxctqjX+KHgSU2BoIA9RgQXYZ79/youjeMpdE54 SuxOCoSHnwETfqa3HBfx2+tUmQvtjf2bu7UQ2/pAxH9cYhtwOvhnZuWqoC7KKvFP4h j3BxIUDY2NHWg== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 7D20D17E37AF; Tue, 17 Dec 2024 16:44:22 +0100 (CET) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, ck.hu@mediatek.com, jitao.shi@mediatek.com, jie.qiu@mediatek.com, junzhi.zhao@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, dmitry.baryshkov@linaro.org Subject: [PATCH v3 23/33] drm/mediatek: mtk_hdmi: Use devm managed version of drm_bridge_add Date: Tue, 17 Dec 2024 16:43:35 +0100 Message-ID: <20241217154345.276919-24-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241217154345.276919-1-angelogioacchino.delregno@collabora.com> References: <20241217154345.276919-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241217_074425_255532_E3FE13B5 X-CRM114-Status: GOOD ( 12.31 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Simplify the probe/remove functions by using devm_drm_bridge_add() as now there is no more need to manually remove the bridge. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 2d5cf7352ed2..5d46d486c68f 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1674,14 +1674,15 @@ static int mtk_hdmi_probe(struct platform_device *pdev) hdmi->bridge.type = DRM_MODE_CONNECTOR_HDMIA; hdmi->bridge.vendor = "MediaTek"; hdmi->bridge.product = "On-Chip HDMI"; - drm_bridge_add(&hdmi->bridge); + + ret = devm_drm_bridge_add(dev, &hdmi->bridge); + if (ret) + return dev_err_probe(dev, ret, "Failed to add bridge\n"); ret = mtk_hdmi_clk_enable_audio(hdmi); - if (ret) { - drm_bridge_remove(&hdmi->bridge); + if (ret) return dev_err_probe(dev, ret, "Failed to enable audio clocks\n"); - } return 0; } @@ -1690,7 +1691,6 @@ static void mtk_hdmi_remove(struct platform_device *pdev) { struct mtk_hdmi *hdmi = platform_get_drvdata(pdev); - drm_bridge_remove(&hdmi->bridge); mtk_hdmi_clk_disable_audio(hdmi); }