Commit 84902b7af642c86a518c17629c0dbe705a4b6d14

Authored by Krzysztof Helt
Committed by Linus Torvalds
1 parent 120c0b6d57

fbdev: change asm/uaccess.h to linux/uaccess.h

This patch replaces <asm/uaccess.h> with <linux/uaccess.h> after the
checkpatch.pl hint.  The include of <asm/uaccess.h> is removed if the driver
does not use it.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 36 changed files with 19 additions and 37 deletions Side-by-side Diff

drivers/video/amifb.c
... ... @@ -52,7 +52,7 @@
52 52 #include <linux/init.h>
53 53 #include <linux/ioport.h>
54 54  
55   -#include <asm/uaccess.h>
  55 +#include <linux/uaccess.h>
56 56 #include <asm/system.h>
57 57 #include <asm/irq.h>
58 58 #include <asm/amigahw.h>
drivers/video/arcfb.c
... ... @@ -48,7 +48,7 @@
48 48 #include <linux/arcfb.h>
49 49 #include <linux/platform_device.h>
50 50  
51   -#include <asm/uaccess.h>
  51 +#include <linux/uaccess.h>
52 52  
53 53 #define floor8(a) (a&(~0x07))
54 54 #define floorXres(a,xres) (a&(~(xres - 1)))
drivers/video/atafb.c
... ... @@ -58,7 +58,7 @@
58 58 #include <linux/interrupt.h>
59 59  
60 60 #include <asm/setup.h>
61   -#include <asm/uaccess.h>
  61 +#include <linux/uaccess.h>
62 62 #include <asm/pgtable.h>
63 63 #include <asm/irq.h>
64 64 #include <asm/io.h>
drivers/video/aty/aty128fb.c
... ... @@ -56,7 +56,7 @@
56 56 #include <linux/vmalloc.h>
57 57 #include <linux/delay.h>
58 58 #include <linux/interrupt.h>
59   -#include <asm/uaccess.h>
  59 +#include <linux/uaccess.h>
60 60 #include <linux/fb.h>
61 61 #include <linux/init.h>
62 62 #include <linux/pci.h>
drivers/video/aty/atyfb_base.c
... ... @@ -68,7 +68,7 @@
68 68 #include <linux/backlight.h>
69 69  
70 70 #include <asm/io.h>
71   -#include <asm/uaccess.h>
  71 +#include <linux/uaccess.h>
72 72  
73 73 #include <video/mach64.h>
74 74 #include "atyfb.h"
drivers/video/aty/mach64_cursor.c
... ... @@ -8,7 +8,6 @@
8 8 #include <linux/string.h>
9 9  
10 10 #include <asm/io.h>
11   -#include <asm/uaccess.h>
12 11  
13 12 #ifdef __sparc__
14 13 #include <asm/fbio.h>
drivers/video/aty/radeon_base.c
... ... @@ -69,7 +69,7 @@
69 69 #include <linux/device.h>
70 70  
71 71 #include <asm/io.h>
72   -#include <asm/uaccess.h>
  72 +#include <linux/uaccess.h>
73 73  
74 74 #ifdef CONFIG_PPC_OF
75 75  
drivers/video/backlight/cr_bllcd.c
... ... @@ -36,7 +36,6 @@
36 36 #include <linux/backlight.h>
37 37 #include <linux/lcd.h>
38 38 #include <linux/pci.h>
39   -#include <asm/uaccess.h>
40 39  
41 40 /* The LVDS- and panel power controls sits on the
42 41 * GPIO port of the ISA bridge.
drivers/video/backlight/progear_bl.c
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/fb.h>
24 24 #include <linux/backlight.h>
25 25 #include <linux/pci.h>
26   -#include <asm/uaccess.h>
27 26  
28 27 #define PMU_LPCR 0xB0
29 28 #define SB_MPS1 0x61
drivers/video/clps711xfb.c
... ... @@ -29,7 +29,7 @@
29 29  
30 30 #include <asm/hardware.h>
31 31 #include <asm/mach-types.h>
32   -#include <asm/uaccess.h>
  32 +#include <linux/uaccess.h>
33 33  
34 34 #include <asm/hardware/clps7111.h>
35 35 #include <asm/arch/syspld.h>
drivers/video/console/fbcon.c
... ... @@ -78,7 +78,6 @@
78 78 #include <asm/fb.h>
79 79 #include <asm/irq.h>
80 80 #include <asm/system.h>
81   -#include <asm/uaccess.h>
82 81 #ifdef CONFIG_ATARI
83 82 #include <asm/atariints.h>
84 83 #endif
drivers/video/console/softcursor.c
... ... @@ -15,7 +15,6 @@
15 15 #include <linux/fb.h>
16 16 #include <linux/slab.h>
17 17  
18   -#include <asm/uaccess.h>
19 18 #include <asm/io.h>
20 19  
21 20 #include "fbcon.h"
drivers/video/cyber2000fb.c
... ... @@ -50,7 +50,6 @@
50 50 #include <asm/io.h>
51 51 #include <asm/pgtable.h>
52 52 #include <asm/system.h>
53   -#include <asm/uaccess.h>
54 53  
55 54 #ifdef __arm__
56 55 #include <asm/mach-types.h>
drivers/video/epson1355fb.c
... ... @@ -57,7 +57,7 @@
57 57  
58 58 #include <asm/types.h>
59 59 #include <asm/io.h>
60   -#include <asm/uaccess.h>
  60 +#include <linux/uaccess.h>
61 61  
62 62 #include <video/epson1355.h>
63 63  
drivers/video/fb_defio.c
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/interrupt.h>
20 20 #include <linux/fb.h>
21 21 #include <linux/list.h>
22   -#include <asm/uaccess.h>
23 22  
24 23 /* to support deferred IO */
25 24 #include <linux/rmap.h>
drivers/video/fb_sys_fops.c
... ... @@ -11,7 +11,7 @@
11 11 */
12 12 #include <linux/fb.h>
13 13 #include <linux/module.h>
14   -#include <asm/uaccess.h>
  14 +#include <linux/uaccess.h>
15 15  
16 16 ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count,
17 17 loff_t *ppos)
drivers/video/fbcmap.c
... ... @@ -15,8 +15,7 @@
15 15 #include <linux/module.h>
16 16 #include <linux/fb.h>
17 17 #include <linux/slab.h>
18   -
19   -#include <asm/uaccess.h>
  18 +#include <linux/uaccess.h>
20 19  
21 20 static u16 red2[] __read_mostly = {
22 21 0x0000, 0xaaaa
drivers/video/hecubafb.c
... ... @@ -45,7 +45,7 @@
45 45 #include <linux/init.h>
46 46 #include <linux/platform_device.h>
47 47 #include <linux/list.h>
48   -#include <asm/uaccess.h>
  48 +#include <linux/uaccess.h>
49 49  
50 50 /* Apollo controller specific defines */
51 51 #define APOLLO_START_NEW_IMG 0xA0
drivers/video/imsttfb.c
... ... @@ -29,7 +29,7 @@
29 29 #include <linux/init.h>
30 30 #include <linux/pci.h>
31 31 #include <asm/io.h>
32   -#include <asm/uaccess.h>
  32 +#include <linux/uaccess.h>
33 33  
34 34 #if defined(CONFIG_PPC)
35 35 #include <linux/nvram.h>
drivers/video/imxfb.c
... ... @@ -34,7 +34,6 @@
34 34  
35 35 #include <asm/hardware.h>
36 36 #include <asm/io.h>
37   -#include <asm/uaccess.h>
38 37 #include <asm/arch/imxfb.h>
39 38  
40 39 /*
drivers/video/kyro/fbdev.c
... ... @@ -21,7 +21,7 @@
21 21 #include <linux/init.h>
22 22 #include <linux/pci.h>
23 23 #include <asm/io.h>
24   -#include <asm/uaccess.h>
  24 +#include <linux/uaccess.h>
25 25 #ifdef CONFIG_MTRR
26 26 #include <asm/mtrr.h>
27 27 #endif
drivers/video/matrox/matroxfb_base.c
... ... @@ -113,7 +113,7 @@
113 113 #include "matroxfb_g450.h"
114 114 #include <linux/matroxfb.h>
115 115 #include <linux/interrupt.h>
116   -#include <asm/uaccess.h>
  116 +#include <linux/uaccess.h>
117 117  
118 118 #ifdef CONFIG_PPC_PMAC
119 119 #include <asm/machdep.h>
drivers/video/matrox/matroxfb_crtc2.c
... ... @@ -15,7 +15,7 @@
15 15 #include "matroxfb_misc.h"
16 16 #include "matroxfb_DAC1064.h"
17 17 #include <linux/matroxfb.h>
18   -#include <asm/uaccess.h>
  18 +#include <linux/uaccess.h>
19 19  
20 20 /* **************************************************** */
21 21  
drivers/video/matrox/matroxfb_g450.c
... ... @@ -17,7 +17,6 @@
17 17 #include "matroxfb_DAC1064.h"
18 18 #include "g450_pll.h"
19 19 #include <linux/matroxfb.h>
20   -#include <asm/uaccess.h>
21 20 #include <asm/div64.h>
22 21  
23 22 #include "matroxfb_g450.h"
drivers/video/matrox/matroxfb_maven.c
... ... @@ -18,7 +18,6 @@
18 18 #include <linux/i2c.h>
19 19 #include <linux/matroxfb.h>
20 20 #include <asm/div64.h>
21   -#include <asm/uaccess.h>
22 21  
23 22 #define MAVEN_I2CID (0x1B)
24 23  
drivers/video/neofb.c
... ... @@ -72,7 +72,6 @@
72 72 #include <asm/irq.h>
73 73 #include <asm/pgtable.h>
74 74 #include <asm/system.h>
75   -#include <asm/uaccess.h>
76 75  
77 76 #ifdef CONFIG_MTRR
78 77 #include <asm/mtrr.h>
drivers/video/pnx4008/pnxrgbfb.c
... ... @@ -26,7 +26,6 @@
26 26 #include <linux/init.h>
27 27 #include <linux/platform_device.h>
28 28  
29   -#include <asm/uaccess.h>
30 29 #include "sdum.h"
31 30 #include "fbcommon.h"
32 31  
drivers/video/ps3fb.c
... ... @@ -34,7 +34,7 @@
34 34 #include <linux/kthread.h>
35 35 #include <linux/freezer.h>
36 36  
37   -#include <asm/uaccess.h>
  37 +#include <linux/uaccess.h>
38 38 #include <linux/fb.h>
39 39 #include <linux/init.h>
40 40 #include <asm/time.h>
drivers/video/pvr2fb.c
... ... @@ -72,7 +72,7 @@
72 72 #endif
73 73  
74 74 #ifdef CONFIG_SH_STORE_QUEUES
75   -#include <asm/uaccess.h>
  75 +#include <linux/uaccess.h>
76 76 #include <asm/cpu/sq.h>
77 77 #endif
78 78  
drivers/video/pxafb.c
... ... @@ -43,7 +43,6 @@
43 43 #include <asm/hardware.h>
44 44 #include <asm/io.h>
45 45 #include <asm/irq.h>
46   -#include <asm/uaccess.h>
47 46 #include <asm/div64.h>
48 47 #include <asm/arch/pxa-regs.h>
49 48 #include <asm/arch/bitfield.h>
drivers/video/sa1100fb.c
... ... @@ -178,7 +178,6 @@
178 178 #include <asm/hardware.h>
179 179 #include <asm/io.h>
180 180 #include <asm/mach-types.h>
181   -#include <asm/uaccess.h>
182 181 #include <asm/arch/assabet.h>
183 182 #include <asm/arch/shannon.h>
184 183  
drivers/video/savage/savagefb_driver.c
... ... @@ -57,7 +57,6 @@
57 57 #include <asm/irq.h>
58 58 #include <asm/pgtable.h>
59 59 #include <asm/system.h>
60   -#include <asm/uaccess.h>
61 60  
62 61 #ifdef CONFIG_MTRR
63 62 #include <asm/mtrr.h>
drivers/video/sis/sis_main.c
... ... @@ -58,7 +58,7 @@
58 58 #include <linux/capability.h>
59 59 #include <linux/fs.h>
60 60 #include <linux/types.h>
61   -#include <asm/uaccess.h>
  61 +#include <linux/uaccess.h>
62 62 #include <asm/io.h>
63 63 #ifdef CONFIG_MTRR
64 64 #include <asm/mtrr.h>
drivers/video/sstfb.c
... ... @@ -88,7 +88,7 @@
88 88 #include <linux/init.h>
89 89 #include <linux/slab.h>
90 90 #include <asm/io.h>
91   -#include <asm/uaccess.h>
  91 +#include <linux/uaccess.h>
92 92 #include <video/sstfb.h>
93 93  
94 94  
drivers/video/vermilion/vermilion.c
... ... @@ -39,7 +39,6 @@
39 39 #include <asm/cacheflush.h>
40 40 #include <asm/tlbflush.h>
41 41 #include <linux/mmzone.h>
42   -#include <asm/uaccess.h>
43 42  
44 43 /* #define VERMILION_DEBUG */
45 44  
... ... @@ -21,7 +21,6 @@
21 21 #include <linux/interrupt.h>
22 22 #include <linux/platform_device.h>
23 23  
24   -#include <asm/uaccess.h>
25 24 #include <linux/fb.h>
26 25 #include <linux/init.h>
27 26