From patchwork Wed Feb 19 10:20:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11390951 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 B0C2A17E0 for ; Wed, 19 Feb 2020 10:21:59 +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 8F9F72464E for ; Wed, 19 Feb 2020 10:21:59 +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="I0KTH0Uk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F9F72464E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 68F2C6EB2F; Wed, 19 Feb 2020 10:21:43 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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 6649F6EB2F for ; Wed, 19 Feb 2020 10:21:42 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id g3so27480315wrs.12 for ; Wed, 19 Feb 2020 02:21:42 -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=jGkQy6GARMrTdcko1Rer3WUnvLpzhV0C66wlxAxhWNE=; b=I0KTH0UkBAvrOSijIO4+h7syZUN60LJupdfC6Nj/MjoFy01AeAyKX6hS3qK8A/nkPH Z+KpeWnSVlILc6CexbTKyKQ81hlEAbn+VNwRgcLRub/S6F6bJGGQvb756PmOCyEiI3fQ VFPwmZfHfBlC3fQjWz4WQdz70krfrRUgkgv8s= 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=jGkQy6GARMrTdcko1Rer3WUnvLpzhV0C66wlxAxhWNE=; b=BDeOsBa/pSji9adAylO0o2U3saVRJxLyDVFYrSLNxEJUzPAfYm/uQgHkLWePthhHRc KWfJYph6W/Zmfpqabz5Z3vmRsOutN/Q2VswirZ9W7FsIkEzaNqluIW7jfpPccDT/8QN6 /YWb3dCwOksMAgf/duQDpF47+eGepIduJAIcN2BmDcX9J5u5etAKhI0Y/bejl18eD+yM AEzJuSlB3SlZLAURNKQBZSJz/JkqYii0f8vgLR38+hZMA/BfMmWTHJBJ8fPGZwIdw6vf mKZlvgOgTnXHAfPF/GtkoiSI4p8o4Xv+ZvVtn5M/VKCt7GWEFj59jPeGzkSAp238tu1u GISg== X-Gm-Message-State: APjAAAWjuf7BUf/KqaVLfO5HEYQhnGANgEBfnMwZ5Q9EIF3VkLDLaf0l MthoYyGqIThqKqYjkjW4GDDlJg== X-Google-Smtp-Source: APXvYqxytavNXoCPEGoURGrJpjzYeGuccrYtk5frvOQ50HTSIjjncj6zXH9yKZW8W08f70W0KjTN+g== X-Received: by 2002:a5d:5452:: with SMTP id w18mr33447398wrv.333.1582107701051; Wed, 19 Feb 2020 02:21:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:21:40 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 19 Feb 2020 11:20:38 +0100 Message-Id: <20200219102122.1607365-9-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 Subject: [Intel-gfx] [PATCH 08/52] drm/qxl: Use drmm_add_final_kfree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: spice-devel@lists.freedesktop.org, Daniel Vetter , Intel Graphics Development , virtualization@lists.linux-foundation.org, Gerd Hoffmann , Daniel Vetter , Dave Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" With this we can drop the final kfree from the release function. Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Gerd Hoffmann Cc: virtualization@lists.linux-foundation.org Cc: spice-devel@lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 2 -- drivers/gpu/drm/qxl/qxl_kms.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 4fda3f9b29f4..09102e2efabc 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -144,8 +144,6 @@ static void qxl_drm_release(struct drm_device *dev) */ qxl_modeset_fini(qdev); qxl_device_fini(qdev); - dev->dev_private = NULL; - kfree(qdev); } static void diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 70b20ee4741a..09d7b5f6d172 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -27,6 +27,7 @@ #include #include +#include #include #include "qxl_drv.h" @@ -121,6 +122,7 @@ int qxl_device_init(struct qxl_device *qdev, qdev->ddev.pdev = pdev; pci_set_drvdata(pdev, &qdev->ddev); qdev->ddev.dev_private = qdev; + drmm_add_final_kfree(&qdev->ddev, qdev); mutex_init(&qdev->gem.mutex); mutex_init(&qdev->update_area_mutex);