From patchwork Mon Mar 23 14:49:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11453143 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 3D59692A for ; Mon, 23 Mar 2020 14:50:41 +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 1B7B420753 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="fhWjLk7V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B7B420753 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 388B46E16D; Mon, 23 Mar 2020 14:50:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DAAC6E13F for ; Mon, 23 Mar 2020 14:50:07 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id d1so15126120wmb.2 for ; Mon, 23 Mar 2020 07:50:06 -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=kbtfsp0R5FIBBIayH8FrOzfPY5PeSem4zC0AulO19ao=; b=fhWjLk7Vc+QyE3oZmJCqXJgVUKzPSQAWgE1p3EYV6TkUYaHdzRuHgeHTQt1rcgNmK1 x079Igf60EYWrI2wSX3fA3EF1aM0kNfkUpaj0WMZKksfLVkuFmYVy4Npa0nQsEWi02AT rwoezWWdF/zmqYJHs1F1QGk3y3vKjOWbCOp6c= 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=kbtfsp0R5FIBBIayH8FrOzfPY5PeSem4zC0AulO19ao=; b=c9zs/4Uk1gify/M9YOYQ458POOki/UPWuFRgZWKZVZzk6Q24BdGhiN23Ph6ex6KDEg Ftpjvrj21pY5pFw4p57k6JWVTJNtKJxKS8SMqUAz5DTu0RsalxeSXdqdjRcflERiS42H 1vw3ZRz44lPOVi8k4r8F35km4080738/z9nv5BLurpGeSjD7mDGqLRf9ZrASe6bJpFTQ yeIkOBqV7XoLD/Kyu9Of2EiHsIiLJCIVd1oQTK0bFUW/TyP3vkQCAY2k7EtlvCpb2/vt FeZWhJGwI6lBTLDhgMIQJx4qKYJ78u5BIc0EpujnGh3UsjbHm9LPeUDElFZOZtD4IGwk 3i8Q== X-Gm-Message-State: ANhLgQ2ns23+zFVi0S/3q7d0DlltGmlWasF4Da6UC0UBRFnBnFIsbwDP SbsIqiiqL/k/YlB9ThEMzOcs1e8XrFnQVA== X-Google-Smtp-Source: ADFU+vuvVzo+09P6HiP33K2yl048cpXbnVs2u0q+PzkPsxuNL8OMXEVxX6njLavxDrR0kUIePMjoRA== X-Received: by 2002:a7b:cb03:: with SMTP id u3mr26069150wmj.12.1584975005306; Mon, 23 Mar 2020 07:50:05 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 07:50:04 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/51] drm/udl: Use drmm_add_final_kfree Date: Mon, 23 Mar 2020 15:49:05 +0100 Message-Id: <20200323144950.3018436-7-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: Sean Paul , Daniel Vetter , Intel Graphics Development , Emil Velikov , Laurent Pinchart , Thomas Zimmermann , Dave Airlie , Daniel Vetter , Thomas Gleixner , Sam Ravnborg 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). Acked-by: Thomas Zimmermann Acked-by: Sam Ravnborg 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); }