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

drm/vboxvideo: Use devm_drm_dev_alloc

Straightforward conversion.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-4-daniel.vetter@ffwll.ch

+5 -14
+5 -14
drivers/gpu/drm/vboxvideo/vbox_drv.c
··· 46 46 if (ret) 47 47 return ret; 48 48 49 - vbox = kzalloc(sizeof(*vbox), GFP_KERNEL); 50 - if (!vbox) 51 - return -ENOMEM; 52 - 53 - ret = drm_dev_init(&vbox->ddev, &driver, &pdev->dev); 54 - if (ret) { 55 - kfree(vbox); 56 - return ret; 57 - } 49 + vbox = devm_drm_dev_alloc(&pdev->dev, &driver, 50 + struct vbox_private, ddev); 51 + if (IS_ERR(vbox)) 52 + return PTR_ERR(vbox); 58 53 59 54 vbox->ddev.pdev = pdev; 60 55 vbox->ddev.dev_private = vbox; 61 56 pci_set_drvdata(pdev, vbox); 62 - drmm_add_final_kfree(&vbox->ddev, vbox); 63 57 mutex_init(&vbox->hw_mutex); 64 58 65 59 ret = pci_enable_device(pdev); 66 60 if (ret) 67 - goto err_dev_put; 61 + return ret; 68 62 69 63 ret = vbox_hw_init(vbox); 70 64 if (ret) ··· 94 100 vbox_hw_fini(vbox); 95 101 err_pci_disable: 96 102 pci_disable_device(pdev); 97 - err_dev_put: 98 - drm_dev_put(&vbox->ddev); 99 103 return ret; 100 104 } 101 105 ··· 106 114 vbox_mode_fini(vbox); 107 115 vbox_mm_fini(vbox); 108 116 vbox_hw_fini(vbox); 109 - drm_dev_put(&vbox->ddev); 110 117 } 111 118 112 119 #ifdef CONFIG_PM_SLEEP