From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1702EC54FD0 for ; Fri, 24 Apr 2020 14:56:11 +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 ECB662071E for ; Fri, 24 Apr 2020 14:56:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECB662071E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org 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 6D0176E958; Fri, 24 Apr 2020 14:56:09 +0000 (UTC) Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4457F6E471; Fri, 24 Apr 2020 14:56:07 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id 0815420035; Fri, 24 Apr 2020 16:56:02 +0200 (CEST) Date: Fri, 24 Apr 2020 16:55:56 +0200 From: Sam Ravnborg To: Daniel Vetter Subject: Re: [PATCH 11/59] drm/udl: Use devm_drm_dev_alloc Message-ID: <20200424145556.GA20856@ravnborg.org> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> <20200415074034.175360-12-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200415074034.175360-12-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=ULXz4hXy c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=8nJEP1OIZ-IA:10 a=7gkXJVJtAAAA:8 a=QyXUC8HyAAAA:8 a=SJz97ENfAAAA:8 a=20KFwNOVAAAA:8 a=pGLkceISAAAA:8 a=e5mUnYsNAAAA:8 a=2YAvaSaLqpQgbBnbYXwA:9 a=wPNLvfGTeEIA:10 a=E9Po1WZjFZOl8hwRPBS3:22 a=vFet0B0WnEQeilDPIY6i:22 a=Vxmtnl_E_bksehYqCbjh:22 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: Intel Graphics Development , Emil Velikov , DRI Development , Thomas Zimmermann , Dave Airlie , Daniel Vetter , Thomas Gleixner , Sean Paul Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Daniel. On Wed, Apr 15, 2020 at 09:39:46AM +0200, Daniel Vetter wrote: > Also init the fbdev emulation before we register the device, that way > we can rely on the auto-cleanup and simplify the probe error code even > more. > = > v2: Rebase on top of Thomas' patches to remove the return value from > drm_fbdev_generic_setup() with the rebase the changelog in confusing as this patch does nothing of what is described in the changelog. Only the title (that is in convinently not available when replying to email) describes what this patch does. With the changelog properly adjusted: Acked-by: Sam Ravnborg > = > Signed-off-by: Daniel Vetter > Cc: Noralf Tr=F8nnes > Cc: Dave Airlie > Cc: Sean Paul > Cc: Thomas Zimmermann > Cc: Daniel Vetter > Cc: Emil Velikov > Cc: Sam Ravnborg > Cc: Thomas Gleixner > --- > drivers/gpu/drm/udl/udl_drv.c | 26 +++++++------------------- > 1 file changed, 7 insertions(+), 19 deletions(-) > = > diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c > index 9cc6d075cb40..523f60e02a85 100644 > --- a/drivers/gpu/drm/udl/udl_drv.c > +++ b/drivers/gpu/drm/udl/udl_drv.c > @@ -57,27 +57,20 @@ static struct udl_device *udl_driver_create(struct us= b_interface *interface) > struct udl_device *udl; > int r; > = > - udl =3D kzalloc(sizeof(*udl), GFP_KERNEL); > - if (!udl) > - return ERR_PTR(-ENOMEM); > - > - r =3D drm_dev_init(&udl->drm, &driver, &interface->dev); > - if (r) { > - kfree(udl); > - return ERR_PTR(r); > - } > + udl =3D devm_drm_dev_alloc(&interface->dev, &driver, > + struct udl_device, drm); > + if (IS_ERR(udl)) > + return udl; > = > udl->udev =3D udev; > udl->drm.dev_private =3D udl; > - drmm_add_final_kfree(&udl->drm, udl); > = > r =3D udl_init(udl); > - if (r) { > - drm_dev_put(&udl->drm); > + if (r) > return ERR_PTR(r); > - } > = > usb_set_intfdata(interface, udl); > + > return udl; > } > = > @@ -93,17 +86,13 @@ static int udl_usb_probe(struct usb_interface *interf= ace, > = > r =3D drm_dev_register(&udl->drm, 0); > if (r) > - goto err_free; > + return r; > = > DRM_INFO("Initialized udl on minor %d\n", udl->drm.primary->index); > = > drm_fbdev_generic_setup(&udl->drm, 0); > = > return 0; > - > -err_free: > - drm_dev_put(&udl->drm); > - return r; > } > = > static void udl_usb_disconnect(struct usb_interface *interface) > @@ -113,7 +102,6 @@ static void udl_usb_disconnect(struct usb_interface *= interface) > drm_kms_helper_poll_fini(dev); > udl_drop_usb(dev); > drm_dev_unplug(dev); > - drm_dev_put(dev); > } > = > /* > -- = > 2.25.1 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel