Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 06:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/mgag200: Use pcim_enable_device()

Browse Source 
Using the managed function simplifies the error handling. After
unloading the driver, the PCI device should now get disabled as
well.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605135803.19811-4-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2020-06-05 15:57:52 +02:00
parent 91c4dc5787
commit 044e093555
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/mgag200/mgag200_drv.c
View File

@ -52,15 +52,13 @@ static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb"); drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "mgag200drmfb");
ret = pci_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) if (ret)
return ret; return ret;
dev = drm_dev_alloc(&driver, &pdev->dev); dev = drm_dev_alloc(&driver, &pdev->dev);
if (IS_ERR(dev)) { if (IS_ERR(dev))
ret = PTR_ERR(dev); return PTR_ERR(dev);
goto err_pci_disable_device;
}
dev->pdev = pdev; dev->pdev = pdev;
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
@ -81,8 +79,6 @@ err_mgag200_driver_unload:
mgag200_driver_unload(dev); mgag200_driver_unload(dev);
err_drm_dev_put: err_drm_dev_put:
drm_dev_put(dev); drm_dev_put(dev);
err_pci_disable_device:
pci_disable_device(pdev);
return ret; return ret;
} }