Commit 7cbb93d8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/ast: Use managed pci functions 



Allows us to remove a bit of cleanup code.

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Y.C. Chen" <yc_chen@aspeedtech.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-58-daniel.vetter@ffwll.ch
parent 21d456a2

drivers/gpu/drm/ast/ast_drv.c

+3 −7
Original line number Diff line number Diff line
@@ -91,15 +91,13 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	ast_kick_out_firmware_fb(pdev);



	ret = pci_enable_device(pdev);

	ret = pcim_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;

	}

	if (IS_ERR(dev))

		return  PTR_ERR(dev);



	dev->pdev = pdev;

	pci_set_drvdata(pdev, dev);
@@ -120,8 +118,6 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	ast_driver_unload(dev);

err_drm_dev_put:

	drm_dev_put(dev);

err_pci_disable_device:

	pci_disable_device(pdev);

	return ret;



}

drivers/gpu/drm/ast/ast_main.c

+0 −3
Original line number Diff line number Diff line
@@ -531,8 +531,5 @@ void ast_driver_unload(struct drm_device *dev) 
	drm_mode_config_cleanup(dev);



	ast_mm_fini(ast);

	if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET)

		pci_iounmap(dev->pdev, ast->ioregs);

	pci_iounmap(dev->pdev, ast->regs);

	kfree(ast);

}