[PATCH] drm/armada: Remove unused #include <drmP.h>

Daniel Vetter daniel at ffwll.ch
Mon Oct 2 07:32:23 UTC 2017


On Sat, Sep 30, 2017 at 12:34:40PM -0600, Haneen Mohammed wrote:
> On Fri, Sep 29, 2017 at 02:29:31PM +0200, Noralf Trønnes wrote:
> > 
> > Den 29.09.2017 09.25, skrev Daniel Vetter:
> > >On Wed, Sep 27, 2017 at 01:38:46AM -0600, Haneen Mohammed wrote:
> > >>Remove drmP.h as it is not needed anymore since nothing it
> > >>defines is used in these files.
> > >>
> > >>Signed-off-by: Haneen Mohammed <hamohammed.sa at gmail.com>
> > >Applied, thanks.
> > 
> > drivers/gpu/drm/armada/armada_fb.c uses DRM_ERROR() which is defined in
> > include/drm/drmP.h. Doesn't that warrant an inclusion?
> > 
> > Noralf.
> > 
> > >-Daniel
> 
> Actually most of them do use DRM_ERROR. It's my mistake, I did not check every function,
> and just relied on not getting an error when compiled. 
> 
> But this would mean almost all the files would need to include the
> drmP.h then, since they are encouraged to use DRM_DEV_*, right?

We still need to split out the last few bits of drmP.h, then there'd
just be a drm_debug.h or similar helper for this stuff.
-Daniel

> 
> > >>---
> > >>  drivers/gpu/drm/armada/armada_510.c   | 1 -
> > >>  drivers/gpu/drm/armada/armada_drv.c   | 1 -
> > >>  drivers/gpu/drm/armada/armada_fb.c    | 1 -
> > >>  drivers/gpu/drm/armada/armada_fbdev.c | 1 -
> > >>  drivers/gpu/drm/armada/armada_gem.c   | 1 -
> > >>  5 files changed, 5 deletions(-)
> > >>
> > >>diff --git a/drivers/gpu/drm/armada/armada_510.c b/drivers/gpu/drm/armada/armada_510.c
> > >>index ad3d2eb..41a784f 100644
> > >>--- a/drivers/gpu/drm/armada/armada_510.c
> > >>+++ b/drivers/gpu/drm/armada/armada_510.c
> > >>@@ -9,7 +9,6 @@
> > >>   */
> > >>  #include <linux/clk.h>
> > >>  #include <linux/io.h>
> > >>-#include <drm/drmP.h>
> > >>  #include <drm/drm_crtc_helper.h>
> > >>  #include "armada_crtc.h"
> > >>  #include "armada_drm.h"
> > >>diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> > >>index c993bcc..17bb675 100644
> > >>--- a/drivers/gpu/drm/armada/armada_drv.c
> > >>+++ b/drivers/gpu/drm/armada/armada_drv.c
> > >>@@ -9,7 +9,6 @@
> > >>  #include <linux/component.h>
> > >>  #include <linux/module.h>
> > >>  #include <linux/of_graph.h>
> > >>-#include <drm/drmP.h>
> > >>  #include <drm/drm_crtc_helper.h>
> > >>  #include <drm/drm_of.h>
> > >>  #include "armada_crtc.h"
> > >>diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
> > >>index 51839c1..a38d5a0 100644
> > >>--- a/drivers/gpu/drm/armada/armada_fb.c
> > >>+++ b/drivers/gpu/drm/armada/armada_fb.c
> > >>@@ -5,7 +5,6 @@
> > >>   * it under the terms of the GNU General Public License version 2 as
> > >>   * published by the Free Software Foundation.
> > >>   */
> > >>-#include <drm/drmP.h>
> > >>  #include <drm/drm_crtc_helper.h>
> > >>  #include <drm/drm_fb_helper.h>
> > >>  #include "armada_drm.h"
> > >>diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
> > >>index cf6bad1..a2ce83f 100644
> > >>--- a/drivers/gpu/drm/armada/armada_fbdev.c
> > >>+++ b/drivers/gpu/drm/armada/armada_fbdev.c
> > >>@@ -10,7 +10,6 @@
> > >>  #include <linux/kernel.h>
> > >>  #include <linux/module.h>
> > >>-#include <drm/drmP.h>
> > >>  #include <drm/drm_fb_helper.h>
> > >>  #include "armada_crtc.h"
> > >>  #include "armada_drm.h"
> > >>diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> > >>index 49d40aa..190280e 100644
> > >>--- a/drivers/gpu/drm/armada/armada_gem.c
> > >>+++ b/drivers/gpu/drm/armada/armada_gem.c
> > >>@@ -8,7 +8,6 @@
> > >>  #include <linux/dma-buf.h>
> > >>  #include <linux/dma-mapping.h>
> > >>  #include <linux/shmem_fs.h>
> > >>-#include <drm/drmP.h>
> > >>  #include "armada_drm.h"
> > >>  #include "armada_gem.h"
> > >>  #include <drm/armada_drm.h>
> > >>-- 
> > >>2.7.4
> > >>
> > 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list