From patchwork Mon Mar 23 14:49:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11453129 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 C81E492A for ; Mon, 23 Mar 2020 14:50:28 +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 A652520753 for ; Mon, 23 Mar 2020 14:50:28 +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="FnCNYm/h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A652520753 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 E23F66E15E; Mon, 23 Mar 2020 14:50:13 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DAB56E134 for ; Mon, 23 Mar 2020 14:50:11 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id h9so17428177wrc.8 for ; Mon, 23 Mar 2020 07:50:11 -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=gtsrD/aFJQAx1LKfUnSPy4VErkcJPE9ispYy08oNiec=; b=FnCNYm/h3O11W73yUrrq4IYHNAT7v0gn7YNQ+I1h3OimV7UNSvAZjk+Ie4HohTgRNW C+AUMgdgTPIELi5S9GG5ak60t0p3b26W4AFtYB3pvT7ybeaczfLxqZVvgh9wAkkPcsl5 uhkXubC7LmZs3Nn/bSLf32wF3UwtNtEAZucrU= 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=gtsrD/aFJQAx1LKfUnSPy4VErkcJPE9ispYy08oNiec=; b=YsWzPAxr6b1qW0B39kd839QFR/c6HGZQ0XWd/auemOroEVDla4k5/GG69cIB82t3DJ e5+PLboZO0cS4q+8BVaYfE4q4t7/OuSPgqUdWoXHO0g8b9ZbE5cuAX2ezs9YOJMtBpM4 0TQAkg1TL0/2MQUe3vHtX5FvRBoiTeMX2hwr7+uNlwoxXj/rM1mw3uKopvmIgqkgGel8 b3b6fROdOd6L2Jd01i36RpMEHhMvSulufQKIObdZGVGGTx7u/5frnn7pdD4jrHLm/JA5 JL4uWQXClNE1agFCSXGhReT+WjOKVdloc5R1/Vk9OgS+taYeRkjXmDBrtdEFRbR2nUt7 Cl9Q== X-Gm-Message-State: ANhLgQ1v060Ub5M2DW5cDq06DDtuxGAiHhAzhYlDw8O8DvNrAZyof8f5 Ps5ULjOT7LsL2lsoNqEuhQfgEnyNheFRaQ== X-Google-Smtp-Source: ADFU+vtEod6poXJM57oOycTdEiRIYy+MxMIgQeYR2m6kYJZ6RjXo9lYNGin1i7rgXBWM7aoeYwFAYw== X-Received: by 2002:adf:82f7:: with SMTP id 110mr29802263wrc.373.1584975009633; Mon, 23 Mar 2020 07:50:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 07:50:08 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Mon, 23 Mar 2020 15:49:08 +0100 Message-Id: <20200323144950.3018436-10-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 Subject: [Intel-gfx] [PATCH 09/51] drm/cirrus: 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: Daniel Vetter , Intel Graphics Development , virtualization@lists.linux-foundation.org, =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Sam Ravnborg , Linus Walleij Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" With this we can drop the final kfree from the release function. I also noticed that cirrus forgot to call drm_dev_fini(). v2: Don't call kfree(cirrus) after we've handed overship of that to drm_device and the drmm_ stuff. Acked-by: Gerd Hoffmann Acked-by: Sam Ravnborg Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Gerd Hoffmann Cc: Daniel Vetter Cc: "Noralf Trønnes" Cc: Linus Walleij Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: virtualization@lists.linux-foundation.org --- drivers/gpu/drm/cirrus/cirrus.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index d2ff63ce8eaf..2232556ce34c 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -527,10 +528,8 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) static void cirrus_release(struct drm_device *dev) { - struct cirrus_device *cirrus = dev->dev_private; - drm_mode_config_cleanup(dev); - kfree(cirrus); + drm_dev_fini(dev); } DEFINE_DRM_GEM_FOPS(cirrus_fops); @@ -575,9 +574,12 @@ static int cirrus_pci_probe(struct pci_dev *pdev, dev = &cirrus->dev; ret = drm_dev_init(dev, &cirrus_driver, &pdev->dev); - if (ret) - goto err_free_cirrus; + if (ret) { + kfree(cirrus); + goto err_pci_release; + } dev->dev_private = cirrus; + drmm_add_final_kfree(dev, cirrus); ret = -ENOMEM; cirrus->vram = ioremap(pci_resource_start(pdev, 0), @@ -618,8 +620,6 @@ static int cirrus_pci_probe(struct pci_dev *pdev, iounmap(cirrus->vram); err_dev_put: drm_dev_put(dev); -err_free_cirrus: - kfree(cirrus); err_pci_release: pci_release_regions(pdev); return ret;