Commit ecd4b234 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191113155857.9507-2-tzimmermann@suse.de
parent 3bf149bd

drivers/gpu/drm/ast/ast_drv.c

+29 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE