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, URIBL_BLOCKED,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 6D320C54FD0 for ; Fri, 24 Apr 2020 16:34:06 +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 4E55E2071E for ; Fri, 24 Apr 2020 16:34:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E55E2071E 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 8B3E06EAC5; Fri, 24 Apr 2020 16:34:03 +0000 (UTC) Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id C62126EABB; Fri, 24 Apr 2020 16:34:01 +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 62C1B2002B; Fri, 24 Apr 2020 18:33:59 +0200 (CEST) Date: Fri, 24 Apr 2020 18:33:57 +0200 From: Sam Ravnborg To: Daniel Vetter Subject: Re: [PATCH 03/59] drm/vboxvideo: Use devm_drm_dev_alloc Message-ID: <20200424163357.GA3822@ravnborg.org> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> <20200415074034.175360-4-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200415074034.175360-4-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=kj9zAlcOel0A:10 a=QyXUC8HyAAAA:8 a=20KFwNOVAAAA:8 a=7gkXJVJtAAAA:8 a=e5mUnYsNAAAA:8 a=Bk0440REuxafkr821JAA:9 a=CjuIK1q_8ugA:10 a=E9Po1WZjFZOl8hwRPBS3: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: Hans de Goede , Intel Graphics Development , DRI Development , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Apr 15, 2020 at 09:39:38AM +0200, Daniel Vetter wrote: > Straightforward conversion. > > Signed-off-by: Daniel Vetter > Cc: Hans de Goede Acked-by: Sam Ravnborg > --- > drivers/gpu/drm/vboxvideo/vbox_drv.c | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c > index 282348e071fe..7dd25c7a3768 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c > @@ -46,25 +46,19 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > if (ret) > return ret; > > - vbox = kzalloc(sizeof(*vbox), GFP_KERNEL); > - if (!vbox) > - return -ENOMEM; > - > - ret = drm_dev_init(&vbox->ddev, &driver, &pdev->dev); > - if (ret) { > - kfree(vbox); > - return ret; > - } > + vbox = devm_drm_dev_alloc(&pdev->dev, &driver, > + struct vbox_private, ddev); > + if (IS_ERR(vbox)) > + return PTR_ERR(vbox); > > vbox->ddev.pdev = pdev; > vbox->ddev.dev_private = vbox; > pci_set_drvdata(pdev, vbox); > - drmm_add_final_kfree(&vbox->ddev, vbox); > mutex_init(&vbox->hw_mutex); > > ret = pci_enable_device(pdev); > if (ret) > - goto err_dev_put; > + return ret; > > ret = vbox_hw_init(vbox); > if (ret) > @@ -100,8 +94,6 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > vbox_hw_fini(vbox); > err_pci_disable: > pci_disable_device(pdev); > -err_dev_put: > - drm_dev_put(&vbox->ddev); > return ret; > } > > @@ -114,7 +106,6 @@ static void vbox_pci_remove(struct pci_dev *pdev) > vbox_mode_fini(vbox); > vbox_mm_fini(vbox); > vbox_hw_fini(vbox); > - drm_dev_put(&vbox->ddev); > } > > #ifdef CONFIG_PM_SLEEP > -- > 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