diff options
Diffstat (limited to 'drivers/gpu/drm/lima/lima_drv.c')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_drv.c | 11 | 
1 files changed, 4 insertions, 7 deletions
| diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index 39cab4a55f57..10fd9154cc46 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -2,7 +2,8 @@  /* Copyright 2017-2019 Qiang Yu <yuq825@gmail.com> */  #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h>  #include <linux/uaccess.h>  #include <linux/slab.h>  #include <linux/pm_runtime.h> @@ -276,10 +277,7 @@ static const struct drm_driver lima_drm_driver = {  	.patchlevel         = 0,  	.gem_create_object  = lima_gem_create_object, -	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,  	.gem_prime_import_sg_table = drm_gem_shmem_prime_import_sg_table, -	.prime_handle_to_fd = drm_gem_prime_handle_to_fd, -	.gem_prime_mmap = drm_gem_prime_mmap,  };  struct lima_block_reader { @@ -441,7 +439,7 @@ err_out0:  	return err;  } -static int lima_pdev_remove(struct platform_device *pdev) +static void lima_pdev_remove(struct platform_device *pdev)  {  	struct lima_device *ldev = platform_get_drvdata(pdev);  	struct drm_device *ddev = ldev->ddev; @@ -459,7 +457,6 @@ static int lima_pdev_remove(struct platform_device *pdev)  	drm_dev_put(ddev);  	lima_sched_slab_fini(); -	return 0;  }  static const struct of_device_id dt_match[] = { @@ -476,7 +473,7 @@ static const struct dev_pm_ops lima_pm_ops = {  static struct platform_driver lima_platform_driver = {  	.probe      = lima_pdev_probe, -	.remove     = lima_pdev_remove, +	.remove_new = lima_pdev_remove,  	.driver     = {  		.name   = "lima",  		.pm	= &lima_pm_ops, | 
