Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1591252pxf; Fri, 2 Apr 2021 15:30:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1aYn8Cyq2InjAVy+7TQ2+ElbcbTF+xW8/kY3FbOfso4BdnWpeJjbeZUsHJi+hrolZJIgz X-Received: by 2002:a05:6402:2076:: with SMTP id bd22mr17665520edb.378.1617402632008; Fri, 02 Apr 2021 15:30:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617402632; cv=none; d=google.com; s=arc-20160816; b=gHB3V64fzoIPnWezXuQjLnLUcTpRluSSYVQ26SlxKjZQho8rP1Zy/QoH3MN9a2n142 OvUYWaDT94HyOFLxUcw9ye0iOJ8uxYrXQ4Gty3NelznDQKe7OP2sX3QWgn7l9uD3rJrt 6k3WcxeP/n4tynfmk9IjsRhKUMpGBLqhD6sv8+/naPW0HccNTymgBBk26oUtbTd+842P s7aZ7jIKOdEaeKgOOsIHZGm+Cda8M3eVd1CZ9GBQV2qejZdt6q63YO+J1DT+V7r4psE4 W0F0jOxXEdmzqJBm9TFll0PnHmmqhrxIUHHQgfubmlo6oNiL3UOt8gKSLsZl9A3qOQsG tdaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LWCZqEnQt7O4dKOp3uwcwxtiQFjYMPyEMkDo43bfXr8=; b=QrDF1Fz8kP93BuWL6xBBBqBMVWPBoJqhAlI4PxCfQXDQRy+aXuIaPvA4UyGLoFKnuw Kyu9WgxWyLfxfz5uu7s8nr5Ubx8v/M5mAOyuD4cpHYT1KwfAGhv8ESII0/XgrNx/Bv+6 m8hQ83zetMk9tU/JgVZK6434PLMBdLEMhf+I7VapcsDMgN09xJrK7U5DzwlVvEKeyZd0 ELfp4kkC84TabkNnyNkqPeInoYUR34owWk7XbzKxW+GKOztM01BRcA9lFgMiCDUQ/Xga /oYKProS985/b95kW3MI+dwQrDs6bvdtVEDhF9CuGvxGJRj3S5DOOyLO5V9rDL62XaH5 X5Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YHdp6YkA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hc43si9050795ejc.387.2021.04.02.15.30.09; Fri, 02 Apr 2021 15:30:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=YHdp6YkA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233665AbhDBW3h (ORCPT + 99 others); Fri, 2 Apr 2021 18:29:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235659AbhDBW3d (ORCPT ); Fri, 2 Apr 2021 18:29:33 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED3DC061797 for ; Fri, 2 Apr 2021 15:29:31 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id f29so1861344pgm.8 for ; Fri, 02 Apr 2021 15:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LWCZqEnQt7O4dKOp3uwcwxtiQFjYMPyEMkDo43bfXr8=; b=YHdp6YkAZFHy7ph7L0Y8wFiPRja6fUyOKBIrreFiGUeAQaOdtiOE3kD19znNKVphAm QEOc3L9wZlp/cuaGQfUJQCvwElQN+lGbhPWW4Z6S7UKxwunn024GJL4Agcz4MJWbmarp zXXww/rb77+KKMosD1Q9oM7hNimK2+vAzaG9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LWCZqEnQt7O4dKOp3uwcwxtiQFjYMPyEMkDo43bfXr8=; b=FW83BgrtijZdu95+Dup3eJtI5L40dG0+ZAYbg2rj4nbJo4XJr87elUOgEajHowTgbI b1/ZkXqc9g4a62zi6bZzjL25f07ez0khMGM8KR6Xy+r6yMpFU23zgAsFb9jFFDAtIzRr OO3LVN+X7mEVV/siVm/9lj5AzjjEMnc6CEzLixtiqmIBACl6kh6E/ML3Azi6+2hHdpB8 ozXv3GNfkrwIBPhaRqNrJkvs8ogC5OanCdgf8l/hraHpinBFpIb9Sv4hyo2l2Vg1GIK/ EFQdIPLPhIVlXKB6Kko272CaS1NdBSwDPdRWKDJn6RkAK0i2cTxb7mV+FWNgfDcCpnU0 6teQ== X-Gm-Message-State: AOAM531mJat5dvWcyJd0Od/+qQV4ghrVUP90yGIfG17RaEYk/inpNnHU hd/U+AhLtAsAcI2XWP4QvSgC+Q== X-Received: by 2002:a62:1ad0:0:b029:1f2:c7b3:3039 with SMTP id a199-20020a621ad00000b02901f2c7b33039mr14390664pfa.30.1617402570970; Fri, 02 Apr 2021 15:29:30 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:201:6c58:fab2:c5e2:f2d7]) by smtp.gmail.com with ESMTPSA id t16sm9233094pfc.204.2021.04.02.15.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 15:29:30 -0700 (PDT) From: Douglas Anderson To: Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sam Ravnborg Cc: Linus W , Bjorn Andersson , robdclark@chromium.org, Stephen Boyd , Steev Klimaszewski , Maarten Lankhorst , linux-arm-msm@vger.kernel.org, Stanislav Lisovskiy , Douglas Anderson , Daniel Vetter , David Airlie , Robert Foss , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 04/12] drm/bridge: ti-sn65dsi86: Reorder remove() Date: Fri, 2 Apr 2021 15:28:38 -0700 Message-Id: <20210402152701.v3.4.Ifcf1deaa372eba7eeb4f8eb516c5d15b77a657a9@changeid> X-Mailer: git-send-email 2.31.0.208.g409f899ff0-goog In-Reply-To: <20210402222846.2461042-1-dianders@chromium.org> References: <20210402222846.2461042-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let's make the remove() function strictly the reverse of the probe() function so it's easier to reason about. This patch was created by code inspection and should move us closer to a proper remove. Signed-off-by: Douglas Anderson Reviewed-by: Andrzej Hajda --- Changes in v3: - Removed "NOTES" from commit message. drivers/gpu/drm/bridge/ti-sn65dsi86.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 76f43af6735d..c006678c9921 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -1315,20 +1315,21 @@ static int ti_sn_bridge_remove(struct i2c_client *client) if (!pdata) return -EINVAL; - kfree(pdata->edid); - ti_sn_debugfs_remove(pdata); - - of_node_put(pdata->host_node); - - pm_runtime_disable(pdata->dev); - if (pdata->dsi) { mipi_dsi_detach(pdata->dsi); mipi_dsi_device_unregister(pdata->dsi); } + kfree(pdata->edid); + + ti_sn_debugfs_remove(pdata); + drm_bridge_remove(&pdata->bridge); + pm_runtime_disable(pdata->dev); + + of_node_put(pdata->host_node); + return 0; } -- 2.31.0.208.g409f899ff0-goog