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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9C98C3F2D7 for ; Mon, 2 Mar 2020 22:28:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCE6920866 for ; Mon, 2 Mar 2020 22:28:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="gz2zyeDw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCE6920866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C59F6E8CC; Mon, 2 Mar 2020 22:27:29 +0000 (UTC) Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2B7B6E8AF for ; Mon, 2 Mar 2020 22:27:26 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id z15so1900822wrl.1 for ; Mon, 02 Mar 2020 14:27:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XLB1vU/39S2Lof2grAgxld8x9sPN0Iai5xJTjmM/yrw=; b=gz2zyeDw92tjfvUQHg5JxOClnircKGZKS3A9dwWWiMBjTghPQZf/wl4m/L1QzmU5mo IN9BV9+TQ7k0fbiuL8hL9OiXEoARjddtB8AdMW/RMB+xyWhrwoPVxA+xSF58C7zrujQ/ 7LmRpR2e8MlSDe8p5siniyZCxpiTmRgPXG7dI= 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=XLB1vU/39S2Lof2grAgxld8x9sPN0Iai5xJTjmM/yrw=; b=D/I3zEnWYhBJvzlo0/qSE7ucxc5n1472IVW4xUCzr+lkmvY+3YpKaqm+rtE9PIZ+Sx MAl5iYw2ZL8TuliXGkzm6wi6e4z138ZNE0yMrbXFrgNMXB0gMFFK9x9f9wS1354SNoCA BQv6MgCa8+WaTy2KxqnJ71MiBfVQtXQf6j+bfIhJeJgh4Iroi7y0MLNogHhGBRSfgpRD IaJjvnYC4kCfGIeevdSvQfas7gEuxXg1b8IApFOZCDrOUwzibXRDHRNep7z7iJ5xjGml ioqZG0IJYWWdX/oQOCajGKdesRkMKND71/AWxT3YCE030hAdGIvRAW3/jo1uCBSsQmey 8dMQ== X-Gm-Message-State: ANhLgQ2aJDrAX+w7JEmfliztFQgHAeBVnV0o4aRmtG6Ka1DFk+G/NOX7 0iiY+yKTzpbDcQnEtVc290E8/Vo3P+A= X-Google-Smtp-Source: ADFU+vuUjfxngpkQcrLGTPuwROZuakjZovqai1az90//TPKjP7VfXSrOJ+yfCrY4hzJo+cYgTqsvOw== X-Received: by 2002:a5d:5609:: with SMTP id l9mr1555758wrv.48.1583188045300; Mon, 02 Mar 2020 14:27:25 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o18sm26114589wrv.60.2020.03.02.14.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:27:24 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 36/51] drm/rcar-du: Drop explicit drm_mode_config_cleanup call Date: Mon, 2 Mar 2020 23:26:16 +0100 Message-Id: <20200302222631.3861340-37-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> References: <20200302222631.3861340-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , linux-renesas-soc@vger.kernel.org, Kieran Bingham , Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Sam Ravnborg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's right above the drm_dev_put(). This is made possible by a preceeding patch which added a drmm_ cleanup action to drm_mode_config_init(), hence all we need to do to ensure that drm_mode_config_cleanup() is run on final drm_device cleanup is check the new error code for _init(). Aside: Another driver with a bit much devm_kzalloc, which should probably use drmm_kzalloc instead ... v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Cc: Sam Ravnborg Cc: Thomas Zimmermann Reviewed-by: Laurent Pinchart (v2) Cc: Laurent Pinchart Signed-off-by: Daniel Vetter Cc: Laurent Pinchart Cc: Kieran Bingham Cc: linux-renesas-soc@vger.kernel.org --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 - drivers/gpu/drm/rcar-du/rcar_du_kms.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 654e2dd08146..3e67cf70f040 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -530,7 +530,6 @@ static int rcar_du_remove(struct platform_device *pdev) drm_dev_unregister(ddev); drm_kms_helper_poll_fini(ddev); - drm_mode_config_cleanup(ddev); drm_dev_put(ddev); diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index fcfd916227d1..482329102f19 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -712,7 +712,9 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) unsigned int i; int ret; - drm_mode_config_init(dev); + ret = drmm_mode_config_init(dev); + if (ret) + return ret; dev->mode_config.min_width = 0; dev->mode_config.min_height = 0; -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel