[PATCH] media: ddbridge: Move asm includes after linux ones

[PATCH] media: ddbridge: Move asm includes after linux ones

[Nathan Chancellor]

Without this, cpumask_t and bool are not defined:

In file included from drivers/media/pci/ddbridge/ddbridge-ci.c:19:
In file included from drivers/media/pci/ddbridge/ddbridge.h:22:
./arch/arm/include/asm/irq.h:35:50: error: unknown type name 'cpumask_t'
extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
                                                 ^
./arch/arm/include/asm/irq.h:36:9: error: unknown type name 'bool'
                                           bool exclude_self);
                                           ^

Doing a survey of the kernel tree, this appears to be expected because
'#include <asm/irq.h>' is always after the linux includes.

This also fixes warnings of this variety (with Clang):

In file included from drivers/media/pci/ddbridge/ddbridge-ci.c:19:
In file included from drivers/media/pci/ddbridge/ddbridge.h:56:
In file included from ./include/media/dvb_net.h:22:
In file included from ./include/linux/netdevice.h:50:
In file included from ./include/uapi/linux/neighbour.h:6:
In file included from ./include/linux/netlink.h:9:
In file included from ./include/net/scm.h:11:
In file included from ./include/linux/sched/signal.h:6:
./include/linux/signal.h:87:11: warning: array index 3 is past the end
of the array (which contains 2 elements) [-Warray-bounds]
                return (set->sig[3] | set->sig[2] |
                        ^        ~
./arch/arm/include/asm/signal.h:17:2: note: array 'sig' declared here
        unsigned long sig[_NSIG_WORDS];
        ^

Fixes: b6973637c4cc ("media: ddbridge: remove another duplicate of io.h and sort includes")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 drivers/media/pci/ddbridge/ddbridge.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h
index 0be6ed216e65..b834449e78f8 100644
--- a/drivers/media/pci/ddbridge/ddbridge.h
+++ b/drivers/media/pci/ddbridge/ddbridge.h
@@ -18,9 +18,6 @@
 #ifndef _DDBRIDGE_H_
 #define _DDBRIDGE_H_
 
-#include <asm/dma.h>
-#include <asm/irq.h>
-
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
@@ -48,6 +45,9 @@
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
 
+#include <asm/dma.h>
+#include <asm/irq.h>
+
 #include <media/dmxdev.h>
 #include <media/dvb_ca_en50221.h>
 #include <media/dvb_demux.h>
-- 
2.20.0

Re: [PATCH] media: ddbridge: Move asm includes after linux ones

[Guenter Roeck]

On Mon, Dec 10, 2018 at 04:35:14PM -0700, Nathan Chancellor wrote:
> Without this, cpumask_t and bool are not defined:
> 
> In file included from drivers/media/pci/ddbridge/ddbridge-ci.c:19:
> In file included from drivers/media/pci/ddbridge/ddbridge.h:22:
> ./arch/arm/include/asm/irq.h:35:50: error: unknown type name 'cpumask_t'
> extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
>                                                  ^
> ./arch/arm/include/asm/irq.h:36:9: error: unknown type name 'bool'
>                                            bool exclude_self);
>                                            ^
> 
> Doing a survey of the kernel tree, this appears to be expected because
> '#include <asm/irq.h>' is always after the linux includes.
> 
> This also fixes warnings of this variety (with Clang):
> 
> In file included from drivers/media/pci/ddbridge/ddbridge-ci.c:19:
> In file included from drivers/media/pci/ddbridge/ddbridge.h:56:
> In file included from ./include/media/dvb_net.h:22:
> In file included from ./include/linux/netdevice.h:50:
> In file included from ./include/uapi/linux/neighbour.h:6:
> In file included from ./include/linux/netlink.h:9:
> In file included from ./include/net/scm.h:11:
> In file included from ./include/linux/sched/signal.h:6:
> ./include/linux/signal.h:87:11: warning: array index 3 is past the end
> of the array (which contains 2 elements) [-Warray-bounds]
>                 return (set->sig[3] | set->sig[2] |
>                         ^        ~
> ./arch/arm/include/asm/signal.h:17:2: note: array 'sig' declared here
>         unsigned long sig[_NSIG_WORDS];
>         ^
> 
> Fixes: b6973637c4cc ("media: ddbridge: remove another duplicate of io.h and sort includes")
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/media/pci/ddbridge/ddbridge.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h
> index 0be6ed216e65..b834449e78f8 100644
> --- a/drivers/media/pci/ddbridge/ddbridge.h
> +++ b/drivers/media/pci/ddbridge/ddbridge.h
> @@ -18,9 +18,6 @@
>  #ifndef _DDBRIDGE_H_
>  #define _DDBRIDGE_H_
>  
> -#include <asm/dma.h>
> -#include <asm/irq.h>
> -
>  #include <linux/clk.h>
>  #include <linux/completion.h>
>  #include <linux/delay.h>
> @@ -48,6 +45,9 @@
>  #include <linux/vmalloc.h>
>  #include <linux/workqueue.h>
>  
> +#include <asm/dma.h>
> +#include <asm/irq.h>
> +
>  #include <media/dmxdev.h>
>  #include <media/dvb_ca_en50221.h>
>  #include <media/dvb_demux.h>
> -- 
> 2.20.0
>