From patchwork Fri Feb 21 21:02:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11397357 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 2638917EF for ; Fri, 21 Feb 2020 21:03:46 +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 04E6F2073A for ; Fri, 21 Feb 2020 21:03:46 +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="TzE+QYA5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04E6F2073A 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 2EF816F51F; Fri, 21 Feb 2020 21:03:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 4DC436F511 for ; Fri, 21 Feb 2020 21:03:38 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id e8so3532878wrm.5 for ; Fri, 21 Feb 2020 13:03:38 -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=gKWR/t9h5ZQ8oC0csntnZ62otqvVOekkZh+S0/SdzhE=; b=TzE+QYA5e4H1ERPWfuNEF+gpqabhL1tTjGYtGrBHv2QC7+C17e+i0CGwnVa1MBePf+ qdLwXvYZOyRG+Mu5dhKjn12Ef+R/3LCk0I4hc8iFs5wx0FxzHL7jbCJMXH+NVxm/MIGm YOoWrJL2GRxeePzFVXN8UGPfqCdmusjN7Pm+c= 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=gKWR/t9h5ZQ8oC0csntnZ62otqvVOekkZh+S0/SdzhE=; b=IhBP7m9Oq2u99/0ZMQe7dRFQq8trXm364s2PZQRPoXRUkfM4d4KZWCOUMDBnhYg4wo e5k0sZv30Ic92DUJS0OJJGLMs4IZyZ4U3mvqZRtEFlbPmjonuhnfm3tsiba+fFSLXhrH 3eV619A0luW9fCVZZvSezIlBNVVY/JkwDrK5wjgY9rt/66It03pJOEgxgs7NOO5BPBG5 5reTZVVtkFIe1jlvCal4iDfi5znamZhdpwgudAF7hUeX6kkNsfQJely7pex6F1M7fxyo EEXpwtRPpujL+5zzTdynnawI51Fzbm23gtskuRpgLYJh3g26dNeWALumJYsH5ufF5t8x 6gcQ== X-Gm-Message-State: APjAAAXL9J4bTg1GHso5Dky6W8Rxnq2tYSAV3FOah/uSnWeLMiHPB/O/ zW+sUTxerhhg5Hj8fbLE0qS32gIw3ho= X-Google-Smtp-Source: APXvYqwHS3wNfXJc+el08SanFXgdvHDfR4f/8UZJNgK8WmMARaRphlMxSQx0jCyDS4QaJjAPlpOJdg== X-Received: by 2002:adf:e8ca:: with SMTP id k10mr47662067wrn.50.1582319016492; Fri, 21 Feb 2020 13:03:36 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z6sm5483930wrw.36.2020.02.21.13.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 13:03:35 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/51] drm/udl: Use drmm_add_final_kfree Date: Fri, 21 Feb 2020 22:02:34 +0100 Message-Id: <20200221210319.2245170-7-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221210319.2245170-1-daniel.vetter@ffwll.ch> References: <20200221210319.2245170-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: Sam Ravnborg , Daniel Vetter , Intel Graphics Development , Emil Velikov , Laurent Pinchart , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Thomas Gleixner , Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With this we can drop the final kfree from the release function. v2: We need drm_dev_put to unroll the driver creation (once drm_dev_init and drmm_add_final_kfree suceeded), otherwise the drmm_ magic doesn't happen. v3: Actually squash in the fixup (Laurent). Signed-off-by: Daniel Vetter Cc: Laurent Pinchart Cc: Dave Airlie Cc: Sean Paul Cc: Thomas Zimmermann Cc: Emil Velikov Cc: Daniel Vetter Cc: "Noralf Trønnes" Cc: Thomas Gleixner Cc: Sam Ravnborg --- drivers/gpu/drm/udl/udl_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index e6c1cd77d4d4..6a5594946096 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -38,7 +39,6 @@ static void udl_driver_release(struct drm_device *dev) udl_fini(dev); udl_modeset_cleanup(dev); drm_dev_fini(dev); - kfree(dev); } static struct drm_driver driver = { @@ -77,11 +77,11 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface) udl->udev = udev; udl->drm.dev_private = udl; + drmm_add_final_kfree(&udl->drm, udl); r = udl_init(udl); if (r) { - drm_dev_fini(&udl->drm); - kfree(udl); + drm_dev_put(&udl->drm); return ERR_PTR(r); }