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>
2007-10-16 01:29:04 -07:00 · 2007-10-16 01:29:04 -07:00 · 84902b7af6
commit 84902b7af6
parent 120c0b6d57
36 changed files with 19 additions and 37 deletions
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@ -52,7 +52,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/amigahw.h>
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@ -48,7 +48,7 @@
 #include <linux/arcfb.h>
 #include <linux/platform_device.h>

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #define floor8(a) (a&(~0x07))
 #define floorXres(a,xres) (a&(~(xres - 1)))
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@ -58,7 +58,7 @@
 #include <linux/interrupt.h>

 #include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/io.h>
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@ -56,7 +56,7 @@
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@ -68,7 +68,7 @@
 #include <linux/backlight.h>

 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <video/mach64.h>
 #include "atyfb.h"
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@ -8,7 +8,6 @@
 #include <linux/string.h>

 #include <asm/io.h>
-#include <asm/uaccess.h>

 #ifdef __sparc__
 #include <asm/fbio.h>
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@ -69,7 +69,7 @@
 #include <linux/device.h>

 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #ifdef CONFIG_PPC_OF

--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@ -36,7 +36,6 @@
 #include <linux/backlight.h>
 #include <linux/lcd.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>

 /* The LVDS- and panel power controls sits on the
 * GPIO port of the ISA bridge.
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@ -23,7 +23,6 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>

 #define PMU_LPCR               0xB0
 #define SB_MPS1                0x61
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@ -29,7 +29,7 @@

 #include <asm/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <asm/hardware/clps7111.h>
 #include <asm/arch/syspld.h>
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@ -78,7 +78,6 @@
 #include <asm/fb.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #ifdef CONFIG_ATARI
 #include <asm/atariints.h>
 #endif
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@ -15,7 +15,6 @@
 #include <linux/fb.h>
 #include <linux/slab.h>

-#include <asm/uaccess.h>
 #include <asm/io.h>

 #include "fbcon.h"
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@ -50,7 +50,6 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>

 #ifdef __arm__
 #include <asm/mach-types.h>
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@ -57,7 +57,7 @@

 #include <asm/types.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #include <video/epson1355.h>

--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>

 /* to support deferred IO */
 #include <linux/rmap.h>
--- a/drivers/video/fb_sys_fops.c
+++ b/drivers/video/fb_sys_fops.c
@ -11,7 +11,7 @@
 */
 #include <linux/fb.h>
 #include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count,
 		    loff_t *ppos)
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@ -15,8 +15,7 @@
 #include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
-
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 static u16 red2[] __read_mostly = {
    0x0000, 0xaaaa
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@ -45,7 +45,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 /* Apollo controller specific defines */
 #define APOLLO_START_NEW_IMG	0xA0
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@ -29,7 +29,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #if defined(CONFIG_PPC)
 #include <linux/nvram.h>
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@ -34,7 +34,6 @@

 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/arch/imxfb.h>

 /*
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@ -113,7 +113,7 @@
 #include "matroxfb_g450.h"
 #include <linux/matroxfb.h>
 #include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 #ifdef CONFIG_PPC_PMAC
 #include <asm/machdep.h>
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@ -15,7 +15,7 @@
 #include "matroxfb_misc.h"
 #include "matroxfb_DAC1064.h"
 #include <linux/matroxfb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>

 /* **************************************************** */

--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@ -17,7 +17,6 @@
 #include "matroxfb_DAC1064.h"
 #include "g450_pll.h"
 #include <linux/matroxfb.h>
-#include <asm/uaccess.h>
 #include <asm/div64.h>

 #include "matroxfb_g450.h"
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@ -18,7 +18,6 @@
 #include <linux/i2c.h>
 #include <linux/matroxfb.h>
 #include <asm/div64.h>
-#include <asm/uaccess.h>

 #define MAVEN_I2CID	(0x1B)

--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@ -72,7 +72,6 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>

 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>

-#include <asm/uaccess.h>
 #include "sdum.h"
 #include "fbcommon.h"

--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@ -34,7 +34,7 @@
 #include <linux/kthread.h>
 #include <linux/freezer.h>

-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <asm/time.h>
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@ -72,7 +72,7 @@
 #endif

 #ifdef CONFIG_SH_STORE_QUEUES
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/cpu/sq.h>
 #endif

--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@ -43,7 +43,6 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/uaccess.h>
 #include <asm/div64.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/bitfield.h>
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@ -178,7 +178,6 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/uaccess.h>
 #include <asm/arch/assabet.h>
 #include <asm/arch/shannon.h>

--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@ -57,7 +57,6 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>

 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@ -58,7 +58,7 @@
 #include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/io.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@ -88,7 +88,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <video/sstfb.h>


--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@ -39,7 +39,6 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <linux/mmzone.h>
-#include <asm/uaccess.h>

 /* #define VERMILION_DEBUG */

--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@ -21,7 +21,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>

-#include <asm/uaccess.h>
 #include <linux/fb.h>
 #include <linux/init.h>