leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ast: Call struct drm_driver.{load, unload} before registering device

Browse Source 
Both callbacks are deprecated. Remove them and call functions explicitly.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191113155857.9507-3-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann
2019-11-13 16:58:57 +01:00
parent ecd4b234e2
commit 7c7b7c39fd
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/ast/ast_drv.c
View File

@@ -104,17 +104,24 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->pdev = pdev; dev->pdev = pdev;
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
ret = drm_dev_register(dev, ent->driver_data); ret = ast_driver_load(dev, ent->driver_data);
if (ret) if (ret)
goto err_drm_dev_put; goto err_drm_dev_put;
ret = drm_dev_register(dev, ent->driver_data);
if (ret)
goto err_ast_driver_unload;
return 0; return 0;
err_ast_driver_unload:
ast_driver_unload(dev);
err_drm_dev_put: err_drm_dev_put:
drm_dev_put(dev); drm_dev_put(dev);
err_pci_disable_device: err_pci_disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
return ret; return ret;
} }
static void static void
@@ -123,6 +130,7 @@ ast_pci_remove(struct pci_dev *pdev)
struct drm_device *dev = pci_get_drvdata(pdev); struct drm_device *dev = pci_get_drvdata(pdev);
drm_dev_unregister(dev); drm_dev_unregister(dev);
ast_driver_unload(dev);
drm_dev_put(dev); drm_dev_put(dev);
} }
@@ -228,9 +236,6 @@ static struct drm_driver driver = {
DRIVER_GEM | DRIVER_GEM |
DRIVER_MODESET, DRIVER_MODESET,
.load = ast_driver_load,
.unload = ast_driver_unload,
.fops = &ast_fops, .fops = &ast_fops,
.name = DRIVER_NAME, .name = DRIVER_NAME,
.desc = DRIVER_DESC, .desc = DRIVER_DESC,