From patchwork Thu Oct 21 07:39:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12574163 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B6FAC433EF for ; Thu, 21 Oct 2021 07:41:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 396E461251 for ; Thu, 21 Oct 2021 07:41:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbhJUHng (ORCPT ); Thu, 21 Oct 2021 03:43:36 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:34667 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231575AbhJUHnL (ORCPT ); Thu, 21 Oct 2021 03:43:11 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.west.internal (Postfix) with ESMTP id 947B92B01324; Thu, 21 Oct 2021 03:40:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 21 Oct 2021 03:40:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=r1YAMUMbYh8TB z8LKCCpgMzm2QMxfhcouzSjIrys2jM=; b=K+9/UMTd3DYjSXs3xz2YxytyV0jbJ ZSa9qH9SGAvg00qoGXmnjvUrhA+6CY0oNdBVCWKIpVAV3gJkiGzAtk21kDhG2LEW KN5g12uwAObnWJ7IsvQw5QJWeAEJ7Zx/9Xd7+9MkVQX10fQTZO+zcSibnavTOmUS 66PjBR1n8A1Q60+awDDN7sUFOf1cl04f2+MqJIJivh7ql/IQA8a5K/48SL2Qa77W 8gmDO/ygQf9QlRdx8XhoO0Zhjwx9eTmCaSqlRMpx+IeqYhJHn9OaTGhi7+7Io7CC 8FtKw/e4IYdR9eI6rhDpMcn/NyfXWhNC1NthTRxJ8ugzZptfANCRuzl7w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=r1YAMUMbYh8TBz8LKCCpgMzm2QMxfhcouzSjIrys2jM=; b=GXe9tVuh Y189C23kwB3Dv6xlnm31NpLXpIQCjhUbiq61u7usMTgCNAxJaPoYOEMkQNYM0us7 i1QYHmqxEy+/H3nr4xCDvP3tccVj1ZTXoz0DIEX1A5upVuuweiamNEHBFO/x5+Jh ople7YSc9rmKwZddQ3sanBDuWd7YUCDOMFxpSkkW/4oZu4lqf0GERbTyqoY/3vIE cj4wkB+ArLN3T4549FWB/4ss7ycZ2ugqly4gVB/5ss+HdjgH9DeH2Dkw5VypSKLK jKqlCJJNwgKLeP4Cra1p6kbLSGfl408zPOl6KnMZtpgH0NnHkHJEif/EQXmVIOzg pa4kVZlYe29Y1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvddvhedgudduiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveev heehvdenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 21 Oct 2021 03:40:52 -0400 (EDT) From: Maxime Ripard To: Laurent Pinchart , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , Sam Ravnborg , Daniel Vetter , David Airlie , Thierry Reding , Andrzej Hajda , Robert Foss , Neil Armstrong , Jonas Karlman , Jernej Skrabec Cc: Seung-Woo Kim , Xinliang Liu , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Tian Tao , freedreno@lists.freedesktop.org, Chen Feng , Joonyoung Shim , Kyungmin Park , John Stultz , Rob Clark , linux-arm-msm@vger.kernel.org, Sean Paul , Inki Dae , Xinwei Kong , dri-devel@lists.freedesktop.org, Marek Vasut Subject: [PATCH v5 13/21] drm/bridge: sn65dsi83: Fix bridge removal Date: Thu, 21 Oct 2021 09:39:39 +0200 Message-Id: <20211021073947.499373-14-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211021073947.499373-1-maxime@cerno.tech> References: <20211021073947.499373-1-maxime@cerno.tech> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Commit 24417d5b0c00 ("drm/bridge: ti-sn65dsi83: Implement .detach callback") moved the unregistration of the bridge DSI device and bridge itself to the detach callback. While this is correct for the DSI device detach and unregistration, the bridge is added in the driver probe, and should thus be removed as part of its remove callback. Cc: Marek Vasut Fixes: 24417d5b0c00 ("drm/bridge: ti-sn65dsi83: Implement .detach callback") Signed-off-by: Maxime Ripard Reviewed-by: Marek Vasut --- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c index 52030a82f3e1..3bfd07caf8d7 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -297,7 +297,6 @@ static void sn65dsi83_detach(struct drm_bridge *bridge) mipi_dsi_detach(ctx->dsi); mipi_dsi_device_unregister(ctx->dsi); - drm_bridge_remove(&ctx->bridge); ctx->dsi = NULL; } @@ -693,6 +692,7 @@ static int sn65dsi83_remove(struct i2c_client *client) { struct sn65dsi83 *ctx = i2c_get_clientdata(client); + drm_bridge_remove(&ctx->bridge); of_node_put(ctx->host_node); return 0;