Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/cirrus: Use devm_drm_dev_alloc

Already using devm_drm_dev_init, so very simple replacment.

Acked-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: virtualization@lists.linux-foundation.org
Cc: Emil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-36-daniel.vetter@ffwll.ch

+4 -9
+4 -9
drivers/gpu/drm/cirrus/cirrus.c
··· 567 567 return ret; 568 568 569 569 ret = -ENOMEM; 570 - cirrus = kzalloc(sizeof(*cirrus), GFP_KERNEL); 571 - if (cirrus == NULL) 572 - return ret; 570 + cirrus = devm_drm_dev_alloc(&pdev->dev, &cirrus_driver, 571 + struct cirrus_device, dev); 572 + if (IS_ERR(cirrus)) 573 + return PTR_ERR(cirrus); 573 574 574 575 dev = &cirrus->dev; 575 - ret = devm_drm_dev_init(&pdev->dev, dev, &cirrus_driver); 576 - if (ret) { 577 - kfree(cirrus); 578 - return ret; 579 - } 580 576 dev->dev_private = cirrus; 581 - drmm_add_final_kfree(dev, cirrus); 582 577 583 578 cirrus->vram = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0), 584 579 pci_resource_len(pdev, 0));