From patchwork Wed Feb 19 10:20:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11391039 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DF28930 for ; Wed, 19 Feb 2020 10:22:57 +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 599492464E for ; Wed, 19 Feb 2020 10:22:57 +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="Ir2fjXfA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 599492464E 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 92F7E6EB58; Wed, 19 Feb 2020 10:22:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 068B26EB4A for ; Wed, 19 Feb 2020 10:21:51 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id s10so5852858wmh.3 for ; Wed, 19 Feb 2020 02:21:50 -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=jfKWZZU6Yo+Zwjdd+Cefvuzj8Pr73ZnaVy/LVnilzqI=; b=Ir2fjXfAiSi1/Az1oVWoQvr2fPgf/L7EsQv7yYw912JhjtBhLlKapW1CwtCM9Rahzu LYyJ7N2sag5W74w77U1skoznHQz49+bmSb7popcXaX7RXdD899no/aSL+SfJhPbB3YmF 2JiXumwfBtGoKk/9oKCYNzrroY01catGXt0Gg= 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=jfKWZZU6Yo+Zwjdd+Cefvuzj8Pr73ZnaVy/LVnilzqI=; b=QXgr64oYXQZreGlqtYernvP/NTTr3qt3pHMmJfSxA+DZCnrHS1ZrT6mu4dcS9e49sn OCpvYaHmKEJXFhXR2W2p5lCIGTPV8VoNEqSs/vj3KTqDMr7I1BbmJdHsuLMqDUVfR1pa XqMvSgHLD5y81Z0Kq4dCVPuU759wgzEB3hchjOZxzjZ/V8npmGv9YGHJ1IjNl1hfZnrj 2iJOvjQO3h+ua9HLeBpQIjCYHdmmB7muaxozAay8mfVWBGg1l7jUrTo43Wlx+X1FI6zp tVmtsIp5qMKVKSJ2weiQ4/ZTYmyoLZk5t/9NBxwcd9TMPMvEQ1MZdMO5vKxfZD8gbDsu xEFw== X-Gm-Message-State: APjAAAW7FPvJwSmdyKk+Am7oXrNK8Z/edjX8zHiZdippJsJVmnXl/iQF iDjlwwZ3DluHLXPvF9oi63WA+dXGujA= X-Google-Smtp-Source: APXvYqzL9+oifxqGLHZRLebvSVIYcCNuGw6HDVu4CHjHiOSAmxvloVbb0tY+YiP5GItskQueUdNUng== X-Received: by 2002:a7b:c084:: with SMTP id r4mr8679725wmh.99.1582107709433; Wed, 19 Feb 2020 02:21:49 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s23sm2370339wra.15.2020.02.19.02.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:21:48 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 15/52] drm/vkms: Use drmm_add_final_kfree Date: Wed, 19 Feb 2020 11:20:45 +0100 Message-Id: <20200219102122.1607365-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> References: <20200219102122.1607365-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: Haneen Mohammed , Rodrigo Siqueira , Daniel Vetter , Intel Graphics Development , Daniel Vetter 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. Signed-off-by: Daniel Vetter Cc: Rodrigo Siqueira Cc: Haneen Mohammed Cc: Daniel Vetter --- drivers/gpu/drm/vkms/vkms_drv.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 860de052e820..2f35fe789343 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -158,13 +159,14 @@ static int __init vkms_init(void) &vkms_device->platform->dev); if (ret) goto out_unregister; + drmm_add_final_kfree(&vkms_device->drm, vkms_device); ret = dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); if (ret) { DRM_ERROR("Could not initialize DMA support\n"); - goto out_fini; + goto out_put; } vkms_device->drm.irq_enabled = true; @@ -172,25 +174,25 @@ static int __init vkms_init(void) ret = drm_vblank_init(&vkms_device->drm, 1); if (ret) { DRM_ERROR("Failed to vblank\n"); - goto out_fini; + goto out_put; } ret = vkms_modeset_init(vkms_device); if (ret) - goto out_fini; + goto out_put; ret = drm_dev_register(&vkms_device->drm, 0); if (ret) - goto out_fini; + goto out_put; return 0; -out_fini: - drm_dev_fini(&vkms_device->drm); +out_put: + drm_dev_put(&vkms_device->drm); + return ret; out_unregister: platform_device_unregister(vkms_device->platform); - out_free: kfree(vkms_device); return ret; @@ -205,8 +207,6 @@ static void __exit vkms_exit(void) drm_dev_unregister(&vkms_device->drm); drm_dev_put(&vkms_device->drm); - - kfree(vkms_device); } module_init(vkms_init);