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=ham 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 3E18FC3F2CD for ; Mon, 2 Mar 2020 22:27:26 +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 114C520866 for ; Mon, 2 Mar 2020 22:27:26 +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="CPsbPcuP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 114C520866 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 2E9506E87F; Mon, 2 Mar 2020 22:27:00 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id E95066E883 for ; Mon, 2 Mar 2020 22:26:58 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id r17so1855872wrj.7 for ; Mon, 02 Mar 2020 14:26:58 -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=+/pGRbOBuN9NBYPufErjJfDxd/6SyXCPu2tsjdlkKXE=; b=CPsbPcuPNvd+k9DXu7cTrSAqCk9UDl5h0aVNBhVqfohQyr3J+QGu2H8V8FlKVoy4nt 4/enqqzyZJDbYOJIvyt+PlkXcJWzsog5QFABcoFv88Jr6X8dygUMH9M/XIbbzHH9v5Dj IafFRR4iGxTjh6RhnQ1ugK55pTJf5PtNaGf4E= 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=+/pGRbOBuN9NBYPufErjJfDxd/6SyXCPu2tsjdlkKXE=; b=GABsSaqjwXRV62zj+1FB5YqTyZWwAZi7HhZVu7Xe7eJrPi2VtJbiUm5ribZ+TKTASS uPjazMm8e7zRt7Iy7nhgdT1vnzCLXQqFIhR4iWY7qMBLRb25+hhSiqOvF0vRtZC7ESj+ pND+31Bdy1ot1fJDhmQG4DsdgXBIg46JiERPz4VdNuPcyxjP0qSsdGD+ibWsPBGeWVyo Kj147BU+ekbZwBgNTn68ZajqQXk/zYEJvGLDsbj15fxvOhnz2CXrO7YCHFqcIk7vNyIJ 4khuH/W3TWNKilcLWiraiB9bFUNU/dTufn1eVKTG23ugd9jtHmfLKCNzux7hx/0yEWGg 9A+A== X-Gm-Message-State: ANhLgQ1/YU4LlGrtufb0O8w5cX2nWW45qY6WG+71fc17zFM5f6Ow351W /WzsURWLiuo1qRf9jkIYEV0Zni1SoN0= X-Google-Smtp-Source: ADFU+vsf4x6rXoU1+b1kXasqpjDw/2udz6m/PUTZGnTGFSnkTZ8uzYely4Unb1oNa++FehWoz7nbTg== X-Received: by 2002:adf:cd87:: with SMTP id q7mr1586717wrj.227.1583188017382; Mon, 02 Mar 2020 14:26:57 -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.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 14:26:56 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Date: Mon, 2 Mar 2020 23:25:53 +0100 Message-Id: <20200302222631.3861340-14-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: Rob Clark , Daniel Vetter , Intel Graphics Development , Sean Paul , Daniel Vetter , Sam Ravnborg , Emil Velikov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With this we can drop the final kfree from the release function. v2: After drm_dev_init/drmm_add_final_kfree we need to clean up everything through a drm_dev_put. Rework the unwind code to match that. Acked-by: Sam Ravnborg Signed-off-by: Daniel Vetter Cc: Daniel Vetter Cc: Emil Velikov Cc: Chris Wilson Cc: Sean Paul Cc: Eric Anholt Cc: Rob Clark Cc: Sam Ravnborg --- drivers/gpu/drm/vgem/vgem_drv.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 909eba43664a..7486014e9149 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include "vgem_drv.h" @@ -432,8 +433,6 @@ static void vgem_release(struct drm_device *dev) platform_device_unregister(vgem->platform); drm_dev_fini(&vgem->drm); - - kfree(vgem); } static struct drm_driver vgem_driver = { @@ -489,16 +488,19 @@ static int __init vgem_init(void) &vgem_device->platform->dev); if (ret) goto out_unregister; + drmm_add_final_kfree(&vgem_device->drm, vgem_device); /* Final step: expose the device/driver to userspace */ - ret = drm_dev_register(&vgem_device->drm, 0); + ret = drm_dev_register(&vgem_device->drm, 0); if (ret) - goto out_fini; + goto out_put; return 0; -out_fini: - drm_dev_fini(&vgem_device->drm); +out_put: + drm_dev_put(&vgem_device->drm); + return ret; + out_unregister: platform_device_unregister(vgem_device->platform); out_free: -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel