All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm: fixup headers_check
@ 2011-01-16 10:46 Felipe Balbi
  2011-01-16 10:46   ` Felipe Balbi
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 10:46 UTC (permalink / raw)
  To: linux-kernel; +Cc: Felipe Balbi, David Airlie, Chris Wilson, dri-devel

Drop the following headers_check errors:
/linux-2.6/usr/include/drm/drm_mode.h:85: found
__[us]{8,16,32,64} type without #include <linux/types.h>
/linux-2.6/usr/include/drm/i915_drm.h:120: found
__[us]{8,16,32,64} type without #include <linux/types.h>
/linux-2.6/usr/include/drm/mga_drm.h:260: found
__[us]{8,16,32,64} type without #include <linux/types.h>
/linux-2.6/usr/include/drm/radeon_drm.h:758: found
__[us]{8,16,32,64} type without #include <linux/types.h>
/linux-2.6/usr/include/drm/via_drm.h:117: found
__[us]{8,16,32,64} type without #include <linux/types.h>

Cc: David Airlie <airlied@linux.ie>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 include/drm/drm_mode.h   |    2 ++
 include/drm/i915_drm.h   |    1 +
 include/drm/mga_drm.h    |    1 +
 include/drm/radeon_drm.h |    1 +
 include/drm/via_drm.h    |    1 +
 5 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 0fc7397..1678d7b 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -27,6 +27,8 @@
 #ifndef _DRM_MODE_H
 #define _DRM_MODE_H
 
+#include <linux/types.h>
+
 #define DRM_DISPLAY_INFO_LEN	32
 #define DRM_CONNECTOR_NAME_LEN	32
 #define DRM_DISPLAY_MODE_LEN	32
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 0039f1f..4b211c8 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -27,6 +27,7 @@
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* Please note that modifications to all structs defined here are
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index c16097f..1107097 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -35,6 +35,7 @@
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index e95a86b..f9ec151 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -33,6 +33,7 @@
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
index fd11a5b..23880b0 100644
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
@@ -24,6 +24,7 @@
 #ifndef _VIA_DRM_H_
 #define _VIA_DRM_H_
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: These defines must be the same as what the Xserver uses.
-- 
1.7.3.4.598.g85356


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 2/2] arm: omap: remove duplicated headers
  2011-01-16 10:46 [PATCH 1/2] drm: fixup headers_check Felipe Balbi
@ 2011-01-16 10:46   ` Felipe Balbi
  2011-01-16 10:47 ` [PATCH 1/2] drm: fixup headers_check Felipe Balbi
  2011-01-16 11:07   ` Chris Wilson
  2 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 10:46 UTC (permalink / raw)
  To: linux-kernel
  Cc: Felipe Balbi, Paul Walmsley, Tony Lindgren, Russell King,
	linux-omap, linux-arm-kernel

A few headers are included twice, remove them.

Found the following errors using make includecheck:
arch/arm/mach-omap2/clock44xx_data.c: prm44xx.h is
included more than once.
arch/arm/mach-omap2/clockdomains44xx_data.c: cm1_44xx.h
is included more than once.
arch/arm/mach-omap2/clockdomains44xx_data.c: cm2_44xx.h
is included more than once.
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c: prm-regbits-34xx.h
is included more than once.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/clock44xx_data.c        |    1 -
 arch/arm/mach-omap2/clockdomains44xx_data.c |    2 --
 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c  |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index e8cb32f..de9ec8d 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -34,7 +34,6 @@
 #include "cm2_44xx.h"
 #include "cm-regbits-44xx.h"
 #include "prm44xx.h"
-#include "prm44xx.h"
 #include "prm-regbits-44xx.h"
 #include "control.h"
 #include "scrm44xx.h"
diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c
index 51920fc..10622c9 100644
--- a/arch/arm/mach-omap2/clockdomains44xx_data.c
+++ b/arch/arm/mach-omap2/clockdomains44xx_data.c
@@ -30,8 +30,6 @@
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"
 
-#include "cm1_44xx.h"
-#include "cm2_44xx.h"
 #include "cm-regbits-44xx.h"
 #include "prm44xx.h"
 #include "prcm44xx.h"
diff --git a/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c b/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
index d523389..cf600e2 100644
--- a/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
@@ -19,7 +19,6 @@
 #include <plat/prcm.h>
 
 #include "powerdomain.h"
-#include "prm-regbits-34xx.h"
 #include "prm.h"
 #include "prm-regbits-24xx.h"
 #include "prm-regbits-34xx.h"
-- 
1.7.3.4.598.g85356

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 2/2] arm: omap: remove duplicated headers
@ 2011-01-16 10:46   ` Felipe Balbi
  0 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 10:46 UTC (permalink / raw)
  To: linux-arm-kernel

A few headers are included twice, remove them.

Found the following errors using make includecheck:
arch/arm/mach-omap2/clock44xx_data.c: prm44xx.h is
included more than once.
arch/arm/mach-omap2/clockdomains44xx_data.c: cm1_44xx.h
is included more than once.
arch/arm/mach-omap2/clockdomains44xx_data.c: cm2_44xx.h
is included more than once.
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c: prm-regbits-34xx.h
is included more than once.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-omap at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/clock44xx_data.c        |    1 -
 arch/arm/mach-omap2/clockdomains44xx_data.c |    2 --
 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c  |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index e8cb32f..de9ec8d 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -34,7 +34,6 @@
 #include "cm2_44xx.h"
 #include "cm-regbits-44xx.h"
 #include "prm44xx.h"
-#include "prm44xx.h"
 #include "prm-regbits-44xx.h"
 #include "control.h"
 #include "scrm44xx.h"
diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c
index 51920fc..10622c9 100644
--- a/arch/arm/mach-omap2/clockdomains44xx_data.c
+++ b/arch/arm/mach-omap2/clockdomains44xx_data.c
@@ -30,8 +30,6 @@
 #include "cm1_44xx.h"
 #include "cm2_44xx.h"
 
-#include "cm1_44xx.h"
-#include "cm2_44xx.h"
 #include "cm-regbits-44xx.h"
 #include "prm44xx.h"
 #include "prcm44xx.h"
diff --git a/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c b/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
index d523389..cf600e2 100644
--- a/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
@@ -19,7 +19,6 @@
 #include <plat/prcm.h>
 
 #include "powerdomain.h"
-#include "prm-regbits-34xx.h"
 #include "prm.h"
 #include "prm-regbits-24xx.h"
 #include "prm-regbits-34xx.h"
-- 
1.7.3.4.598.g85356

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 10:46 [PATCH 1/2] drm: fixup headers_check Felipe Balbi
  2011-01-16 10:46   ` Felipe Balbi
@ 2011-01-16 10:47 ` Felipe Balbi
  2011-01-16 11:07   ` Chris Wilson
  2 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 10:47 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: linux-kernel, David Airlie, Chris Wilson, dri-devel

Hi,

On Sun, Jan 16, 2011 at 12:46:22PM +0200, Felipe Balbi wrote:
> Drop the following headers_check errors:
> /linux-2.6/usr/include/drm/drm_mode.h:85: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/i915_drm.h:120: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/mga_drm.h:260: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/radeon_drm.h:758: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/via_drm.h:117: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> 
> Cc: David Airlie <airlied@linux.ie>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Felipe Balbi <balbi@ti.com>

$SUBJECT shouldn't have number actually. Git added those automatically.
Oh well, not a big deal.

-- 
balbi

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 10:46 [PATCH 1/2] drm: fixup headers_check Felipe Balbi
@ 2011-01-16 11:07   ` Chris Wilson
  2011-01-16 10:47 ` [PATCH 1/2] drm: fixup headers_check Felipe Balbi
  2011-01-16 11:07   ` Chris Wilson
  2 siblings, 0 replies; 13+ messages in thread
From: Chris Wilson @ 2011-01-16 11:07 UTC (permalink / raw)
  To: Felipe Balbi, linux-kernel; +Cc: Felipe Balbi, David Airlie, dri-devel

On Sun, 16 Jan 2011 12:46:22 +0200, Felipe Balbi <balbi@ti.com> wrote:
> Drop the following headers_check errors:
> /linux-2.6/usr/include/drm/drm_mode.h:85: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/i915_drm.h:120: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/mga_drm.h:260: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/radeon_drm.h:758: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/via_drm.h:117: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> 
> Cc: David Airlie <airlied@linux.ie>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  include/drm/drm_mode.h   |    2 ++
>  include/drm/i915_drm.h   |    1 +
>  include/drm/mga_drm.h    |    1 +
>  include/drm/radeon_drm.h |    1 +
>  include/drm/via_drm.h    |    1 +
>  5 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
> index 0fc7397..1678d7b 100644
> --- a/include/drm/drm_mode.h
> +++ b/include/drm/drm_mode.h
> @@ -27,6 +27,8 @@
>  #ifndef _DRM_MODE_H
>  #define _DRM_MODE_H
>  
> +#include <linux/types.h>
> +

Would

#if 0
#include <linux/types.h> /* silence make header_check */
#endif

be an acceptable compromise?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
@ 2011-01-16 11:07   ` Chris Wilson
  0 siblings, 0 replies; 13+ messages in thread
From: Chris Wilson @ 2011-01-16 11:07 UTC (permalink / raw)
  To: linux-kernel; +Cc: dri-devel, Felipe Balbi

On Sun, 16 Jan 2011 12:46:22 +0200, Felipe Balbi <balbi@ti.com> wrote:
> Drop the following headers_check errors:
> /linux-2.6/usr/include/drm/drm_mode.h:85: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/i915_drm.h:120: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/mga_drm.h:260: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/radeon_drm.h:758: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> /linux-2.6/usr/include/drm/via_drm.h:117: found
> __[us]{8,16,32,64} type without #include <linux/types.h>
> 
> Cc: David Airlie <airlied@linux.ie>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  include/drm/drm_mode.h   |    2 ++
>  include/drm/i915_drm.h   |    1 +
>  include/drm/mga_drm.h    |    1 +
>  include/drm/radeon_drm.h |    1 +
>  include/drm/via_drm.h    |    1 +
>  5 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
> index 0fc7397..1678d7b 100644
> --- a/include/drm/drm_mode.h
> +++ b/include/drm/drm_mode.h
> @@ -27,6 +27,8 @@
>  #ifndef _DRM_MODE_H
>  #define _DRM_MODE_H
>  
> +#include <linux/types.h>
> +

Would

#if 0
#include <linux/types.h> /* silence make header_check */
#endif

be an acceptable compromise?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 11:07   ` Chris Wilson
  (?)
@ 2011-01-16 11:16   ` Felipe Balbi
  2011-01-16 11:18     ` Felipe Balbi
  -1 siblings, 1 reply; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 11:16 UTC (permalink / raw)
  To: Chris Wilson; +Cc: Felipe Balbi, linux-kernel, David Airlie, dri-devel

On Sun, Jan 16, 2011 at 11:07:32AM +0000, Chris Wilson wrote:
> On Sun, 16 Jan 2011 12:46:22 +0200, Felipe Balbi <balbi@ti.com> wrote:
> > Drop the following headers_check errors:
> > /linux-2.6/usr/include/drm/drm_mode.h:85: found
> > __[us]{8,16,32,64} type without #include <linux/types.h>
> > /linux-2.6/usr/include/drm/i915_drm.h:120: found
> > __[us]{8,16,32,64} type without #include <linux/types.h>
> > /linux-2.6/usr/include/drm/mga_drm.h:260: found
> > __[us]{8,16,32,64} type without #include <linux/types.h>
> > /linux-2.6/usr/include/drm/radeon_drm.h:758: found
> > __[us]{8,16,32,64} type without #include <linux/types.h>
> > /linux-2.6/usr/include/drm/via_drm.h:117: found
> > __[us]{8,16,32,64} type without #include <linux/types.h>
> > 
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: dri-devel@lists.freedesktop.org
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > ---
> >  include/drm/drm_mode.h   |    2 ++
> >  include/drm/i915_drm.h   |    1 +
> >  include/drm/mga_drm.h    |    1 +
> >  include/drm/radeon_drm.h |    1 +
> >  include/drm/via_drm.h    |    1 +
> >  5 files changed, 6 insertions(+), 0 deletions(-)
> > 
> > diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
> > index 0fc7397..1678d7b 100644
> > --- a/include/drm/drm_mode.h
> > +++ b/include/drm/drm_mode.h
> > @@ -27,6 +27,8 @@
> >  #ifndef _DRM_MODE_H
> >  #define _DRM_MODE_H
> >  
> > +#include <linux/types.h>
> > +
> 
> Would
> 
> #if 0
> #include <linux/types.h> /* silence make header_check */
> #endif
> 
> be an acceptable compromise?

Why would you want to do that ? I truly have those types in use.
headers_check seems to be reporting correctly.

-- 
balbi

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 11:16   ` Felipe Balbi
@ 2011-01-16 11:18     ` Felipe Balbi
  2011-01-16 11:42         ` Dave Airlie
  0 siblings, 1 reply; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 11:18 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: Chris Wilson, linux-kernel, David Airlie, dri-devel

On Sun, Jan 16, 2011 at 01:16:16PM +0200, Felipe Balbi wrote:
> I truly have those types in use.

I meant you :-p

-- 
balbi

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 11:18     ` Felipe Balbi
@ 2011-01-16 11:42         ` Dave Airlie
  0 siblings, 0 replies; 13+ messages in thread
From: Dave Airlie @ 2011-01-16 11:42 UTC (permalink / raw)
  To: balbi; +Cc: Chris Wilson, linux-kernel, David Airlie, dri-devel

[-- Attachment #1: Type: text/plain, Size: 49 bytes --]

I'll push the attached I think this time.

Dave.

[-- Attachment #2: 0001-drm-add-comments-to-stop-pointless-patches.patch --]
[-- Type: text/x-patch, Size: 2379 bytes --]

From 1222ad4188aa2a6046da931487543507a59b7fac Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sun, 16 Jan 2011 21:35:10 +1000
Subject: [PATCH] drm: add comments to stop pointless patches.

How about you fix the headers script to be recursive?

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 include/drm/drm_mode.h   |    3 +++
 include/drm/i915_drm.h   |    1 +
 include/drm/mga_drm.h    |    1 +
 include/drm/radeon_drm.h |    1 +
 include/drm/via_drm.h    |    1 +
 5 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 0fc7397..7a1f6c5 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -27,6 +27,9 @@
 #ifndef _DRM_MODE_H
 #define _DRM_MODE_H
 
+/* this file doesn't need linux/types.h included */
+#include "drm.h"
+
 #define DRM_DISPLAY_INFO_LEN	32
 #define DRM_CONNECTOR_NAME_LEN	32
 #define DRM_DISPLAY_MODE_LEN	32
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 0039f1f..0da0420 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -27,6 +27,7 @@
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* Please note that modifications to all structs defined here are
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index c16097f..41b4081 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -35,6 +35,7 @@
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index e95a86b..c33f656 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -33,6 +33,7 @@
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
index fd11a5b..ccde589 100644
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
@@ -24,6 +24,7 @@
 #ifndef _VIA_DRM_H_
 #define _VIA_DRM_H_
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: These defines must be the same as what the Xserver uses.
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
@ 2011-01-16 11:42         ` Dave Airlie
  0 siblings, 0 replies; 13+ messages in thread
From: Dave Airlie @ 2011-01-16 11:42 UTC (permalink / raw)
  To: balbi; +Cc: linux-kernel, dri-devel

[-- Attachment #1: Type: text/plain, Size: 49 bytes --]

I'll push the attached I think this time.

Dave.

[-- Attachment #2: 0001-drm-add-comments-to-stop-pointless-patches.patch --]
[-- Type: text/x-patch, Size: 2379 bytes --]

From 1222ad4188aa2a6046da931487543507a59b7fac Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sun, 16 Jan 2011 21:35:10 +1000
Subject: [PATCH] drm: add comments to stop pointless patches.

How about you fix the headers script to be recursive?

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 include/drm/drm_mode.h   |    3 +++
 include/drm/i915_drm.h   |    1 +
 include/drm/mga_drm.h    |    1 +
 include/drm/radeon_drm.h |    1 +
 include/drm/via_drm.h    |    1 +
 5 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 0fc7397..7a1f6c5 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -27,6 +27,9 @@
 #ifndef _DRM_MODE_H
 #define _DRM_MODE_H
 
+/* this file doesn't need linux/types.h included */
+#include "drm.h"
+
 #define DRM_DISPLAY_INFO_LEN	32
 #define DRM_CONNECTOR_NAME_LEN	32
 #define DRM_DISPLAY_MODE_LEN	32
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 0039f1f..0da0420 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -27,6 +27,7 @@
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* Please note that modifications to all structs defined here are
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index c16097f..41b4081 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -35,6 +35,7 @@
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index e95a86b..c33f656 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -33,6 +33,7 @@
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
index fd11a5b..ccde589 100644
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
@@ -24,6 +24,7 @@
 #ifndef _VIA_DRM_H_
 #define _VIA_DRM_H_
 
+/* this file doesn't need linux/types.h included */
 #include "drm.h"
 
 /* WARNING: These defines must be the same as what the Xserver uses.
-- 
1.7.2.3


[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/2] drm: fixup headers_check
  2011-01-16 11:42         ` Dave Airlie
  (?)
@ 2011-01-16 12:23         ` Felipe Balbi
  -1 siblings, 0 replies; 13+ messages in thread
From: Felipe Balbi @ 2011-01-16 12:23 UTC (permalink / raw)
  To: Dave Airlie; +Cc: balbi, Chris Wilson, linux-kernel, David Airlie, dri-devel

Hi,

On Sun, Jan 16, 2011 at 09:42:37PM +1000, Dave Airlie wrote:
> I'll push the attached I think this time.

the point of headers_check is exactly to prevent indirect inclusion.
This is even 1st topic o SubmitChecklist:

" 1: If you use a facility then #include the file that defines/declares
that facility.  Don't depend on other header files pulling in that you use."

-- 
balbi

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/2] arm: omap: remove duplicated headers
  2011-01-16 10:46   ` Felipe Balbi
@ 2011-01-16 18:00     ` Paul Walmsley
  -1 siblings, 0 replies; 13+ messages in thread
From: Paul Walmsley @ 2011-01-16 18:00 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: linux-kernel, Tony Lindgren, Russell King, linux-omap,
	linux-arm-kernel

On Sun, 16 Jan 2011, Felipe Balbi wrote:

> A few headers are included twice, remove them.
> 
> Found the following errors using make includecheck:
> arch/arm/mach-omap2/clock44xx_data.c: prm44xx.h is
> included more than once.
> arch/arm/mach-omap2/clockdomains44xx_data.c: cm1_44xx.h
> is included more than once.
> arch/arm/mach-omap2/clockdomains44xx_data.c: cm2_44xx.h
> is included more than once.
> arch/arm/mach-omap2/powerdomain2xxx_3xxx.c: prm-regbits-34xx.h
> is included more than once.

These are probably merge-related.  I'll take this patch for 2.6.38-rc.

Thanks,


- Paul

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 2/2] arm: omap: remove duplicated headers
@ 2011-01-16 18:00     ` Paul Walmsley
  0 siblings, 0 replies; 13+ messages in thread
From: Paul Walmsley @ 2011-01-16 18:00 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, 16 Jan 2011, Felipe Balbi wrote:

> A few headers are included twice, remove them.
> 
> Found the following errors using make includecheck:
> arch/arm/mach-omap2/clock44xx_data.c: prm44xx.h is
> included more than once.
> arch/arm/mach-omap2/clockdomains44xx_data.c: cm1_44xx.h
> is included more than once.
> arch/arm/mach-omap2/clockdomains44xx_data.c: cm2_44xx.h
> is included more than once.
> arch/arm/mach-omap2/powerdomain2xxx_3xxx.c: prm-regbits-34xx.h
> is included more than once.

These are probably merge-related.  I'll take this patch for 2.6.38-rc.

Thanks,


- Paul

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-01-16 18:00 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-16 10:46 [PATCH 1/2] drm: fixup headers_check Felipe Balbi
2011-01-16 10:46 ` [PATCH 2/2] arm: omap: remove duplicated headers Felipe Balbi
2011-01-16 10:46   ` Felipe Balbi
2011-01-16 18:00   ` Paul Walmsley
2011-01-16 18:00     ` Paul Walmsley
2011-01-16 10:47 ` [PATCH 1/2] drm: fixup headers_check Felipe Balbi
2011-01-16 11:07 ` Chris Wilson
2011-01-16 11:07   ` Chris Wilson
2011-01-16 11:16   ` Felipe Balbi
2011-01-16 11:18     ` Felipe Balbi
2011-01-16 11:42       ` Dave Airlie
2011-01-16 11:42         ` Dave Airlie
2011-01-16 12:23         ` Felipe Balbi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.