Drop unused includes, move more includes from the generic etnaviv_drv.h to the units where they are actually used, sort includes. Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 8 -------- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 ++ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 -- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +++- drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index e823e41f6a6b..9d4404723489 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -5,6 +5,7 @@ #include <linux/component.h> #include <linux/dma-mapping.h> +#include <linux/module.h> #include <linux/of_platform.h> #include <linux/uaccess.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index f887a431a11f..eabe394c4e25 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -6,17 +6,9 @@ #ifndef __ETNAVIV_DRV_H__ #define __ETNAVIV_DRV_H__ -#include <linux/clk.h> -#include <linux/cpufreq.h> -#include <linux/kernel.h> #include <linux/list.h> #include <linux/mm_types.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/pm.h> -#include <linux/pm_runtime.h> #include <linux/sizes.h> -#include <linux/slab.h> #include <linux/time64.h> #include <linux/types.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c index bab09bae35d0..0aa8cde68593 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c @@ -4,6 +4,8 @@ */ #include <linux/devcoredump.h> +#include <linux/moduleparam.h> + #include "etnaviv_cmdbuf.h" #include "etnaviv_dump.h" #include "etnaviv_gem.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 3c5e8760d43c..727bb3f5ceb2 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -5,8 +5,6 @@ #include <drm/drm_prime.h> #include <linux/dma-mapping.h> -#include <linux/sched/mm.h> -#include <linux/sched/task.h> #include <linux/shmem_fs.h> #include <linux/spinlock.h> #include <linux/vmalloc.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 8a7cbb44a3d2..f535a627f297 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -6,6 +6,7 @@ #include <drm/drm_file.h> #include <linux/dma-fence-array.h> #include <linux/file.h> +#include <linux/pm_runtime.h> #include <linux/reservation.h> #include <linux/sync_file.h> #include <linux/uaccess.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index b2e0e362afa9..586f7e284272 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -8,8 +8,10 @@ #include <linux/delay.h> #include <linux/dma-fence.h> #include <linux/dma-mapping.h> -#include <linux/moduleparam.h> +#include <linux/module.h> #include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/thermal.h> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c index b163bdbcb880..18c627c5cae1 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c @@ -3,11 +3,11 @@ * Copyright (C) 2014-2018 Etnaviv Project */ +#include <linux/bitops.h> +#include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/sizes.h> #include <linux/slab.h> -#include <linux/dma-mapping.h> -#include <linux/bitops.h> #include "etnaviv_gpu.h" #include "etnaviv_mmu.h" diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c index b2e0a34bb796..072afe9c302b 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 Etnaviv Project */ -#include <linux/kthread.h> +#include <linux/moduleparam.h> #include "etnaviv_drv.h" #include "etnaviv_dump.h" -- 2.20.1 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
