diff options
| author |   Nathan Chancellor <natechancellor@gmail.com> | 2018-12-10 18:35:14 -0500 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-12-20 06:42:14 -0500 |
| commit | bbb55cd708901dedbeeeb929c7012f35afea7882 (patch) | |
| tree | 46ff108549cf4d00a2c0d547c2b9b356cfd38a3a /drivers/media | |
| parent | media: drxk_hard: check if parameter is not NULL (diff) | |
| download | linux-dev-bbb55cd708901dedbeeeb929c7012f35afea7882.tar.xz linux-dev-bbb55cd708901dedbeeeb929c7012f35afea7882.zip | |
media: ddbridge: Move asm includes after linux ones
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/pci/ddbridge/ddbridge.h | 6 |
1 files 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> |