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 12535C3F2CD for ; Mon, 23 Mar 2020 14:50:42 +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 D5E8D20753 for ; Mon, 23 Mar 2020 14:50:41 +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="N1PwzJEe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5E8D20753 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 6E1C16E19A; Mon, 23 Mar 2020 14:50:24 +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 445BA6E157 for ; Mon, 23 Mar 2020 14:50:16 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id b2so17403818wrj.10 for ; Mon, 23 Mar 2020 07:50:16 -0700 (PDT) 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=fwuZx+k2oTvdFoCG8wz3/tjg+SHoKPS36DocaCaM8Rw=; b=N1PwzJEeLEFq/Yu/QEOVGhcUu7kKden1884aHg8xiEkSDxVVf8chQ4inbmuw8Qr4oa 64zjdN6B0x/RhEIYYTjq24Uc3Ut+aqbkyx3I+XITZvplqHO5M/q7ISl8Y1aVh0uS0nt6 cZaNpwmYZMkyUZfkLs86eCirBWhWVWet2wsds= 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=fwuZx+k2oTvdFoCG8wz3/tjg+SHoKPS36DocaCaM8Rw=; b=tGHQl93ibHVedbp9gpdCrMdMVDbc7685bO0UhEOAIzaNpPoQoY0yxbHM3pYsxxFS8t 9gHYRd5TEUhbhuFWrVBQ/IQDvzwIPX3Ey2B3YLTv10OK6i5TWWaB7zE6fmAhJS1DVdVj yfnYsqlxgjQY1okOCesncBB+ffB065JeZgsM+sQH4VuBD/JwoGeS+5ga4UiGNJ6WUXnG vlIRIYKEoTKD+9c1N8HBgQBNPrPqg50tX4sWGBsxcW2YFQzcNQSZ1JE/Kv6fjq3IXJLe vgqdFrnNqVK42VeViAhy5Q5wdaRz2k97wbofLsnxW8MwcuWBl4DFKaaRUHoLMYvOVOi0 q7qQ== X-Gm-Message-State: ANhLgQ0Ok7QFgwPUuU0rcmV1NUZWpZLKWCHcpp94FPydaMLoA32ZoOGL W4Ykdn2llEIbFn3d7zS5VzFB/jZrIP3wmQ== X-Google-Smtp-Source: ADFU+vuJj3JdqmAxSXXOLU+84A1P0+9/NmZZ7HNiM/EwY39Dg0LCRnxO8MMXTUEGrkCp+uozxpgRHg== X-Received: by 2002:adf:fd87:: with SMTP id d7mr30240028wrr.393.1584975014576; Mon, 23 Mar 2020 07:50:14 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s22sm20376522wmc.16.2020.03.23.07.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 07:50:13 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 13/51] drm/vgem: Use drmm_add_final_kfree Date: Mon, 23 Mar 2020 15:49:12 +0100 Message-Id: <20200323144950.3018436-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> References: <20200323144950.3018436-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.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel