[PATCH] drivers/input annotations

	* vortex.c: trivial __iomem annotations
	* serio_raw.c and tsdev.c: equally trivial __user ones.

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/input/gameport/vortex.c b/drivers/input/gameport/vortex.c
index bbdb22a01a35b64b1798088b2dc639d8771b4b6e..e0a1c3eb58252368537751be2a93b8cb4c164167 100644 (file)
--- a/drivers/input/gameport/vortex.c
+++ b/drivers/input/gameport/vortex.c
@@ -55,8 +55,8 @@ MODULE_LICENSE("GPL");
 struct vortex {
        struct gameport gameport;
        struct pci_dev *dev;
-        unsigned char *base;
-        unsigned char *io;
+        unsigned char __iomem *base;
+        unsigned char __iomem *io;
        char phys[32];
 };
 

diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index f4b78bbd5cfe10556ceeafff94857b9707538b1b..f424fdf19e7d604a90cc6e096eadd3c8610ea8ab 100644 (file)
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -157,7 +157,7 @@ static int serio_raw_fetch_byte(struct serio_raw *serio_raw, char *c)
        return !empty;
 }
 
-static ssize_t serio_raw_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
+static ssize_t serio_raw_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
        struct serio_raw_list *list = file->private_data;
        struct serio_raw *serio_raw = list->serio_raw;
@@ -187,7 +187,7 @@ static ssize_t serio_raw_read(struct file *file, char *buffer, size_t count, lof
        return retval;
 }
 
-static ssize_t serio_raw_write(struct file *file, const char *buffer, size_t count, loff_t *ppos)
+static ssize_t serio_raw_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
        struct serio_raw_list *list = file->private_data;
        ssize_t written = 0;

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 7acacb3c689459d70601dfa969a2772743ad0408..18c37d8ac5d6f23cdebeebc74a2cf1fbd559c59c 100644 (file)
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -250,12 +250,12 @@ static int tsdev_ioctl(struct inode *inode, struct file *file,
 
        switch (cmd) {
        case TS_GET_CAL:
-               if (copy_to_user ((void *)arg, &tsdev->cal,
+               if (copy_to_user ((void __user *)arg, &tsdev->cal,
                                  sizeof (struct ts_calibration)))
                        retval = -EFAULT;
                break;
        case TS_SET_CAL:
-               if (copy_from_user (&tsdev->cal, (void *)arg,
+               if (copy_from_user (&tsdev->cal, (void __user *)arg,
                                    sizeof (struct ts_calibration)))
                        retval = -EFAULT;
                break;