Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b6d1f542e3f44f8988b601e3ca6277c143282179

Authored by Ben Dooks
Committed by Russell King
1 parent 9162b7dbf5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h 

Change the include/asm-arm/arch-s3c2410/regs-serial.h
platform data to use the prorper type (upf_t) for the
uart_flags.

Fix all the other parts of arch/arm/mach-s3c2410 to
include <linux/serial_core.h> and all other uses of
the include file.

mach-rx3715.c:101:18: warning: incorrect type in initializer (different base types)
mach-rx3715.c:101:18:    expected unsigned long [unsigned] uart_flags
mach-rx3715.c:101:18:    got restricted unsigned int [usertype] [force] <noident>

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 27 changed files with 26 additions and 6 deletions Side-by-side Diff

arch/arm/mach-s3c2410/cpu.c
Diff comments   View file @ b6d1f54
... ... @@ -26,6 +26,7 @@
26 26 #include <linux/module.h>
27 27 #include <linux/interrupt.h>
28 28 #include <linux/ioport.h>
  29 +#include <linux/serial_core.h>
29 30 #include <linux/platform_device.h>
30 31  
31 32 #include <asm/hardware.h>
arch/arm/mach-s3c2410/devs.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/list.h>
18 18 #include <linux/timer.h>
19 19 #include <linux/init.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/platform_device.h>
21 22  
22 23 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-anubis.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/list.h>
16 16 #include <linux/timer.h>
17 17 #include <linux/init.h>
  18 +#include <linux/serial_core.h>
18 19 #include <linux/platform_device.h>
19 20  
20 21 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-bast.c
Diff comments   View file @ b6d1f54
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/list.h>
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
  19 +#include <linux/serial_core.h>
19 20 #include <linux/platform_device.h>
20 21 #include <linux/dm9000.h>
21 22  
arch/arm/mach-s3c2410/mach-h1940.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/list.h>
18 18 #include <linux/timer.h>
19 19 #include <linux/init.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/platform_device.h>
21 22  
22 23 #include <asm/mach/arch.h>
... ... @@ -36,8 +37,6 @@
36 37 #include <asm/arch/h1940.h>
37 38 #include <asm/arch/h1940-latch.h>
38 39 #include <asm/arch/fb.h>
39   -
40   -#include <linux/serial_core.h>
41 40  
42 41 #include "clock.h"
43 42 #include "devs.h"
arch/arm/mach-s3c2410/mach-n30.c
Diff comments   View file @ b6d1f54
... ... @@ -20,6 +20,7 @@
20 20 #include <linux/timer.h>
21 21 #include <linux/init.h>
22 22 #include <linux/delay.h>
  23 +#include <linux/serial_core.h>
23 24 #include <linux/platform_device.h>
24 25 #include <linux/kthread.h>
25 26  
... ... @@ -36,8 +37,6 @@
36 37 #include <asm/arch/regs-serial.h>
37 38 #include <asm/arch/regs-gpio.h>
38 39 #include <asm/arch/iic.h>
39   -
40   -#include <linux/serial_core.h>
41 40  
42 41 #include "s3c2410.h"
43 42 #include "clock.h"
arch/arm/mach-s3c2410/mach-nexcoder.c
Diff comments   View file @ b6d1f54
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/timer.h>
20 20 #include <linux/init.h>
21 21 #include <linux/string.h>
  22 +#include <linux/serial_core.h>
22 23 #include <linux/platform_device.h>
23 24  
24 25 #include <linux/mtd/map.h>
arch/arm/mach-s3c2410/mach-osiris.c
Diff comments   View file @ b6d1f54
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/timer.h>
17 17 #include <linux/init.h>
18 18 #include <linux/device.h>
  19 +#include <linux/serial_core.h>
19 20  
20 21 #include <asm/mach/arch.h>
21 22 #include <asm/mach/map.h>
arch/arm/mach-s3c2410/mach-otom.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/list.h>
16 16 #include <linux/timer.h>
17 17 #include <linux/init.h>
  18 +#include <linux/serial_core.h>
18 19 #include <linux/platform_device.h>
19 20  
20 21 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-smdk2410.c
Diff comments   View file @ b6d1f54
... ... @@ -35,6 +35,7 @@
35 35 #include <linux/list.h>
36 36 #include <linux/timer.h>
37 37 #include <linux/init.h>
  38 +#include <linux/serial_core.h>
38 39 #include <linux/platform_device.h>
39 40  
40 41 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-smdk2413.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/list.h>
18 18 #include <linux/timer.h>
19 19 #include <linux/init.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/platform_device.h>
21 22  
22 23 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-smdk2440.c
Diff comments   View file @ b6d1f54
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/list.h>
20 20 #include <linux/timer.h>
21 21 #include <linux/init.h>
  22 +#include <linux/serial_core.h>
22 23 #include <linux/platform_device.h>
23 24  
24 25 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/mach-vstms.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/list.h>
16 16 #include <linux/timer.h>
17 17 #include <linux/init.h>
  18 +#include <linux/serial_core.h>
18 19 #include <linux/platform_device.h>
19 20  
20 21 #include <linux/mtd/mtd.h>
arch/arm/mach-s3c2410/pm-simtec.c
Diff comments   View file @ b6d1f54
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/io.h>
28 28  
29 29 #include <asm/arch/map.h>
30   -#include <asm/arch/regs-serial.h>
31 30 #include <asm/arch/regs-gpio.h>
32 31 #include <asm/arch/regs-mem.h>
33 32  
arch/arm/mach-s3c2410/pm.c
Diff comments   View file @ b6d1f54
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/crc32.h>
35 35 #include <linux/ioport.h>
36 36 #include <linux/delay.h>
  37 +#include <linux/serial_core.h>
37 38  
38 39 #include <asm/cacheflush.h>
39 40 #include <asm/hardware.h>
arch/arm/mach-s3c2410/s3c2410-clock.c
Diff comments   View file @ b6d1f54
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/clk.h>
31 31 #include <linux/mutex.h>
32 32 #include <linux/delay.h>
  33 +#include <linux/serial_core.h>
33 34  
34 35 #include <asm/mach/map.h>
35 36  
arch/arm/mach-s3c2410/s3c2410-dma.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/kernel.h>
16 16 #include <linux/init.h>
17 17 #include <linux/sysdev.h>
  18 +#include <linux/serial_core.h>
18 19  
19 20 #include <asm/dma.h>
20 21 #include <asm/arch/dma.h>
arch/arm/mach-s3c2410/s3c2410.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
19 19 #include <linux/sysdev.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/platform_device.h>
21 22  
22 23 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/s3c2412-clock.c
Diff comments   View file @ b6d1f54
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/clk.h>
31 31 #include <linux/mutex.h>
32 32 #include <linux/delay.h>
  33 +#include <linux/serial_core.h>
33 34  
34 35 #include <asm/mach/map.h>
35 36  
arch/arm/mach-s3c2410/s3c2412-dma.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/kernel.h>
16 16 #include <linux/init.h>
17 17 #include <linux/sysdev.h>
  18 +#include <linux/serial_core.h>
18 19  
19 20 #include <asm/dma.h>
20 21 #include <asm/arch/dma.h>
arch/arm/mach-s3c2410/s3c2412.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
19 19 #include <linux/sysdev.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/platform_device.h>
21 22  
22 23 #include <asm/mach/arch.h>
arch/arm/mach-s3c2410/s3c2440-dma.c
Diff comments   View file @ b6d1f54
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/kernel.h>
16 16 #include <linux/init.h>
17 17 #include <linux/sysdev.h>
  18 +#include <linux/serial_core.h>
18 19  
19 20 #include <asm/dma.h>
20 21 #include <asm/arch/dma.h>
arch/arm/mach-s3c2410/s3c2440.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
19 19 #include <linux/platform_device.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/sysdev.h>
21 22 #include <linux/clk.h>
22 23  
arch/arm/mach-s3c2410/s3c2442.c
Diff comments   View file @ b6d1f54
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
19 19 #include <linux/platform_device.h>
  20 +#include <linux/serial_core.h>
20 21 #include <linux/sysdev.h>
21 22 #include <linux/clk.h>
22 23  
arch/arm/mach-s3c2410/s3c244x.c
Diff comments   View file @ b6d1f54
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/list.h>
17 17 #include <linux/timer.h>
18 18 #include <linux/init.h>
  19 +#include <linux/serial_core.h>
19 20 #include <linux/platform_device.h>
20 21 #include <linux/sysdev.h>
21 22 #include <linux/clk.h>
include/asm-arm/arch-s3c2410/regs-serial.h
Diff comments   View file @ b6d1f54
... ... @@ -197,7 +197,7 @@
197 197 unsigned char hwport; /* hardware port number */
198 198 unsigned char unused;
199 199 unsigned short flags;
200   - unsigned long uart_flags; /* default uart flags */
  200 + upf_t uart_flags; /* default uart flags */
201 201  
202 202 unsigned long ucon; /* value of ucon for port */
203 203 unsigned long ulcon; /* value of ulcon for port */
include/asm-arm/arch-s3c2410/uncompress.h
Diff comments   View file @ b6d1f54
... ... @@ -13,6 +13,7 @@
13 13 #ifndef __ASM_ARCH_UNCOMPRESS_H
14 14 #define __ASM_ARCH_UNCOMPRESS_H
15 15  
  16 +typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
16 17  
17 18 /* defines for UART registers */
18 19 #include "asm/arch/regs-serial.h"