drm/ast: Replace drm_get_pci_device() and drm_put_dev()

Both functions are deprecated. Open-code them them in preparation
of removing struct drm_driver.{load,unload}.

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-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index d763da6f0834ab69ff4e1ca85ed83484bc7cfaf4..78c90a3c903b4d0189659e90482315a61b6261ce 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -86,9 +86,35 @@ static void ast_kick_out_firmware_fb(struct pci_dev *pdev)
 
 static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+       struct drm_device *dev;
+       int ret;
+
        ast_kick_out_firmware_fb(pdev);
 
-       return drm_get_pci_dev(pdev, ent, &driver);
+       ret = pci_enable_device(pdev);
+       if (ret)
+               return ret;
+
+       dev = drm_dev_alloc(&driver, &pdev->dev);
+       if (IS_ERR(dev)) {
+               ret = PTR_ERR(dev);
+               goto err_pci_disable_device;
+       }
+
+       dev->pdev = pdev;
+       pci_set_drvdata(pdev, dev);
+
+       ret = drm_dev_register(dev, ent->driver_data);
+       if (ret)
+               goto err_drm_dev_put;
+
+       return 0;
+
+err_drm_dev_put:
+       drm_dev_put(dev);
+err_pci_disable_device:
+       pci_disable_device(pdev);
+       return ret;
 }
 
 static void
@@ -96,7 +122,8 @@ ast_pci_remove(struct pci_dev *pdev)
 {
        struct drm_device *dev = pci_get_drvdata(pdev);
 
-       drm_put_dev(dev);
+       drm_dev_unregister(dev);
+       drm_dev_put(dev);
 }
 
 static int ast_drm_freeze(struct drm_device *dev)