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

PATCH In review Antonino A. Daplas 1 participant 1 message Aug 26, 2007

Subsystems (6)

PowerPC Arm i.MX and Layerscape Framebuffer layer Backlight class/subsystem +2 more subsystems

lore

Share & tools

lore

Antonino A. Daplas

author

2007-08-26 14:23 UTC #0 lore raw

PATCH 5/20 fbdev: change asm/uaccess.h to linux/uaccess.h

From: Krzysztof Helt <[email protected]>

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 <[email protected]>

Signed-off-by Antonino Daplas <[email protected]>

---

 drivers/video/amifb.c                  |    2 +-
 drivers/video/arcfb.c                  |    2 +-
 drivers/video/atafb.c                  |    2 +-
 drivers/video/aty/aty128fb.c           |    2 +-
 drivers/video/aty/atyfb_base.c         |    2 +-
 drivers/video/aty/mach64_cursor.c      |    1 -
 drivers/video/aty/radeon_base.c        |    2 +-
 drivers/video/backlight/cr_bllcd.c     |    1 -
 drivers/video/backlight/progear_bl.c   |    1 -
 drivers/video/clps711xfb.c             |    2 +-
 drivers/video/console/fbcon.c          |    1 -
 drivers/video/console/softcursor.c     |    1 -
 drivers/video/cyber2000fb.c            |    1 -
 drivers/video/epson1355fb.c            |    2 +-
 drivers/video/fb_defio.c               |    1 -
 drivers/video/fb_sys_fops.c            |    2 +-
 drivers/video/fbcmap.c                 |    3 +--
 drivers/video/hecubafb.c               |    2 +-
 drivers/video/imsttfb.c                |    2 +-
 drivers/video/imxfb.c                  |    1 -
 drivers/video/kyro/fbdev.c             |    2 +-
 drivers/video/matrox/matroxfb_base.c   |    2 +-
 drivers/video/matrox/matroxfb_crtc2.c  |    2 +-
 drivers/video/matrox/matroxfb_g450.c   |    1 -
 drivers/video/matrox/matroxfb_maven.c  |    1 -
 drivers/video/neofb.c                  |    1 -
 drivers/video/pnx4008/pnxrgbfb.c       |    1 -
 drivers/video/ps3fb.c                  |    2 +-
 drivers/video/pvr2fb.c                 |    2 +-
 drivers/video/pxafb.c                  |    1 -
 drivers/video/sa1100fb.c               |    1 -
 drivers/video/savage/savagefb_driver.c |    1 -
 drivers/video/sis/sis_main.c           |    2 +-
 drivers/video/sstfb.c                  |    2 +-
 drivers/video/vermilion/vermilion.c    |    1 -
 drivers/video/vfb.c                    |    1 -
 36 files changed, 19 insertions(+), 37 deletions(-)

drivers/video/amifb.c +1 -1

index 1a849b8..f2e243c 100644
@@ -52,7 +52,7 @@ #include <linux/fb.h>
 #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>

drivers/video/arcfb.c +1 -1

index db15bac..c343169 100644
@@ -48,7 +48,7 @@ #include <linux/init.h>
 #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)))

drivers/video/atafb.c +1 -1

index 0038a05..5d4fbaa 100644
@@ -58,7 +58,7 @@ #include <linux/init.h>
 #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>

drivers/video/aty/aty128fb.c +1 -1

index cfcbe37..cbd3308 100644
@@ -56,7 +56,7 @@ #include <linux/slab.h>
 #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>

drivers/video/aty/atyfb_base.c +1 -1

index b537151..abe0c43 100644
@@ -68,7 +68,7 @@ #include <linux/wait.h>
 #include <linux/backlight.h>
 
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <video/mach64.h>
 #include "atyfb.h"

drivers/video/aty/mach64_cursor.c +0 -1

index fe2c6ad..faf95da 100644
@@ -8,7 +8,6 @@ #include <linux/init.h>
 #include <linux/string.h>
 
 #include <asm/io.h>
-#include <asm/uaccess.h>
 
 #ifdef __sparc__
 #include <asm/fbio.h>

drivers/video/aty/radeon_base.c +1 -1

index 47ca62f..22e46b9 100644
@@ -69,7 +69,7 @@ #include <linux/vmalloc.h>
 #include <linux/device.h>
 
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #ifdef CONFIG_PPC_OF

drivers/video/backlight/cr_bllcd.c +0 -1

index 96f2307..280f9e0 100644
@@ -37,7 +37,6 @@ #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/lcd.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>
 
 #define MODULE_NAME "cr_bllcd"

drivers/video/backlight/progear_bl.c +0 -1

index 836ab4d..15fb4d5 100644
@@ -23,7 +23,6 @@ #include <linux/mutex.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>
 
 #define PMU_LPCR               0xB0
 #define SB_MPS1                0x61

drivers/video/clps711xfb.c +1 -1

index dea6579..17b5267 100644
@@ -29,7 +29,7 @@ #include <linux/delay.h>
 
 #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>

drivers/video/console/fbcon.c +0 -1

index e58c87b..6d0dcde 100644
@@ -78,7 +78,6 @@ #include <linux/crc32.h> /* For counting
 #include <asm/fb.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #ifdef CONFIG_ATARI
 #include <asm/atariints.h>
 #endif

drivers/video/console/softcursor.c +0 -1

index 03cfb7a..25f835b 100644
@@ -15,7 +15,6 @@ #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
-#include <asm/uaccess.h>
 #include <asm/io.h>
 
 #include "fbcon.h"

drivers/video/cyber2000fb.c +0 -1

index 9e35353..5e3edf4 100644
@@ -50,7 +50,6 @@ #include <linux/init.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #ifdef __arm__
 #include <asm/mach-types.h>

drivers/video/epson1355fb.c +1 -1

index 33be46c..cc2810e 100644
@@ -57,7 +57,7 @@ #include <linux/platform_device.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <video/epson1355.h>

drivers/video/fb_defio.c +0 -1

index 1a8643f..a0c5d9d 100644
@@ -19,7 +19,6 @@ #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>
 
 /* to support deferred IO */
 #include <linux/rmap.h>

drivers/video/fb_sys_fops.c +1 -1

index cf2538d..ff275d7 100644
@@ -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)

drivers/video/fbcmap.c +1 -2

index 148108a..91b78e6 100644
@@ -15,8 +15,7 @@ #include <linux/string.h>
 #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

drivers/video/hecubafb.c +1 -1

index abfcb50..94e0df8 100644
@@ -45,7 +45,7 @@ #include <linux/fb.h>
 #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

drivers/video/imsttfb.c +1 -1

index 94f4511..3ab91bf 100644
@@ -29,7 +29,7 @@ #include <linux/fb.h>
 #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>

drivers/video/imxfb.c +0 -1

index a125898..986ffa6 100644
@@ -34,7 +34,6 @@ #include <linux/dma-mapping.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/arch/imxfb.h>
 
 /*

drivers/video/kyro/fbdev.c +1 -1

index 1c55799..acb9370 100644
@@ -21,7 +21,7 @@ #include <linux/ioctl.h>
 #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

drivers/video/matrox/matroxfb_base.c +1 -1

index 86ca7b1..b25972a 100644
@@ -113,7 +113,7 @@ #include "matroxfb_crtc2.h"
 #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>

drivers/video/matrox/matroxfb_crtc2.c +1 -1

index 4b3344e..a6ab5b6 100644
@@ -15,7 +15,7 @@ #include "matroxfb_crtc2.h"
 #include "matroxfb_misc.h"
 #include "matroxfb_DAC1064.h"
 #include <linux/matroxfb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /* **************************************************** */

drivers/video/matrox/matroxfb_g450.c +0 -1

index 4d610b4..6209a76 100644
@@ -17,7 +17,6 @@ #include "matroxfb_misc.h"
 #include "matroxfb_DAC1064.h"
 #include "g450_pll.h"
 #include <linux/matroxfb.h>
-#include <asm/uaccess.h>
 #include <asm/div64.h>
 
 #include "matroxfb_g450.h"

drivers/video/matrox/matroxfb_maven.c +0 -1

index de0d755..49cd53e 100644
@@ -18,7 +18,6 @@ #include "matroxfb_DAC1064.h"
 #include <linux/i2c.h>
 #include <linux/matroxfb.h>
 #include <asm/div64.h>
-#include <asm/uaccess.h>
 
 #define MAVEN_I2CID	(0x1B)

drivers/video/neofb.c +0 -1

index 731d7a5..4b6a99b 100644
@@ -72,7 +72,6 @@ #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>

drivers/video/pnx4008/pnxrgbfb.c +0 -1

index f29e66e..685761a 100644
@@ -26,7 +26,6 @@ #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <asm/uaccess.h>
 #include "sdum.h"
 #include "fbcommon.h"

drivers/video/ps3fb.c +1 -1

index 646ec82..e0beb97 100644
@@ -34,7 +34,7 @@ #include <linux/reboot.h>
 #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>

drivers/video/pvr2fb.c +1 -1

index 7d6c298..994baad 100644
@@ -72,7 +72,7 @@ #include <asm/dma.h>
 #endif
 
 #ifdef CONFIG_SH_STORE_QUEUES
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/cpu/sq.h>
 #endif

drivers/video/pxafb.c +0 -1

index fb58e15..5a273e5 100644
@@ -41,7 +41,6 @@ #include <linux/dma-mapping.h>
 #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>

drivers/video/sa1100fb.c +0 -1

index 5d2a4a4..ab2b211 100644
@@ -178,7 +178,6 @@ #include <linux/dma-mapping.h>
 #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>

drivers/video/savage/savagefb_driver.c +0 -1

index b855f4a..37b135d 100644
@@ -57,7 +57,6 @@ #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>

drivers/video/sis/sis_main.c +1 -1

index e8ccace..bc7d236 100644
@@ -58,7 +58,7 @@ #include <linux/vmalloc.h>
 #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>

drivers/video/sstfb.c +1 -1

index 5eff28c..97784f9 100644
@@ -88,7 +88,7 @@ #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <video/sstfb.h>

drivers/video/vermilion/vermilion.c +0 -1

index de531c9..ff9e805 100644
@@ -39,7 +39,6 @@ #include <linux/pci.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <linux/mmzone.h>
-#include <asm/uaccess.h>
 
 /* #define VERMILION_DEBUG */

drivers/video/vfb.c +0 -1

index 64ee78c..02cfc6a 100644
@@ -21,7 +21,6 @@ #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 
-#include <asm/uaccess.h>
 #include <linux/fb.h>
 #include <linux/init.h>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/