[Intel-gfx] [PATCH 35/59] drm/cirrus: Use devm_drm_dev_alloc

[Daniel Vetter]

Already using devm_drm_dev_init, so very simple replacment.

Acked-by: Noralf Trønnes <nor...@tronnes.org>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Cc: Dave Airlie <airl...@redhat.com>
Cc: Gerd Hoffmann <kra...@redhat.com>
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: Sam Ravnborg <s...@ravnborg.org>
Cc: "Noralf Trønnes" <nor...@tronnes.org>
Cc: Rob Herring <r...@kernel.org>
Cc: Thomas Zimmermann <tzimmerm...@suse.de>
Cc: virtualizat...@lists.linux-foundation.org
Cc: Emil Velikov <emil.veli...@collabora.com>
---
 drivers/gpu/drm/cirrus/cirrus.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c
index a36269717c3b..4b65637147ba 100644
--- a/drivers/gpu/drm/cirrus/cirrus.c
+++ b/drivers/gpu/drm/cirrus/cirrus.c
@@ -567,18 +567,13 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
                return ret;
 
        ret = -ENOMEM;
-       cirrus = kzalloc(sizeof(*cirrus), GFP_KERNEL);
-       if (cirrus == NULL)
-               return ret;
+       cirrus = devm_drm_dev_alloc(&pdev->dev, &cirrus_driver,
+                                   struct cirrus_device, dev);
+       if (IS_ERR(cirrus))
+               return PTR_ERR(cirrus);
 
        dev = &cirrus->dev;
-       ret = devm_drm_dev_init(&pdev->dev, dev, &cirrus_driver);
-       if (ret) {
-               kfree(cirrus);
-               return ret;
-       }
        dev->dev_private = cirrus;
-       drmm_add_final_kfree(dev, cirrus);
 
        cirrus->vram = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0),
                                    pci_resource_len(pdev, 0));
-- 
2.25.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx