[PATCH] drivers/macintosh annotations

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index c6073d342405223f6b58e12064a3655038fc6b43..c4b82b5a88dc563af28ee53701b0f3aa7071171a 100644 (file)
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -49,10 +49,10 @@ anslcd_write_byte_data ( unsigned char c )
 }
 
 static ssize_t __pmac
-anslcd_write( struct file * file, const char * buf, 
+anslcd_write( struct file * file, const char __user * buf, 
                                size_t count, loff_t *ppos )
 {
-       const char * p = buf;
+       const char __user *p = buf;
        int i;
 
 #ifdef DEBUG
@@ -75,7 +75,7 @@ static int __pmac
 anslcd_ioctl( struct inode * inode, struct file * file,
                                unsigned int cmd, unsigned long arg )
 {
-       char ch, *temp;
+       char ch, __user *temp;
 
 #ifdef DEBUG
        printk(KERN_DEBUG "LCD: ioctl(%d,%d)\n",cmd,arg);
@@ -91,7 +91,7 @@ anslcd_ioctl( struct inode * inode, struct file * file,
                anslcd_write_byte_ctrl ( 0x02 );
                return 0;
        case ANSLCD_SENDCTRL:
-               temp = (char *) arg;
+               temp = (char __user *) arg;
                __get_user(ch, temp);
                for (; ch; temp++) { /* FIXME: This is ugly, but should work, as a \0 byte is not a valid command code */
                        anslcd_write_byte_ctrl ( ch );

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 8fcaaaee414daeae3b6f06e73a0b98dd3e00ed3e..27e14a7267ec8fea93e9445b4a99f96964581ae2 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2880,6 +2880,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                     u_int cmd, u_long arg)
 {
        struct pmu_private *pp = filp->private_data;
+       __u32 __user *argp = (__u32 __user *)arg;
        int error;
 
        switch (cmd) {
@@ -2906,7 +2907,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                sleep_in_progress = 0;
                return error;
        case PMU_IOC_CAN_SLEEP:
-               return put_user((u32)can_sleep, (__u32 *)arg);
+               return put_user((u32)can_sleep, argp);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
        /* Backlight should have its own device or go via
@@ -2918,13 +2919,13 @@ pmu_ioctl(struct inode * inode, struct file *filp,
                error = get_backlight_level();
                if (error < 0)
                        return error;
-               return put_user(error, (__u32 *)arg);
+               return put_user(error, argp);
        case PMU_IOC_SET_BACKLIGHT:
        {
                __u32 value;
                if (sleep_in_progress)
                        return -EBUSY;
-               error = get_user(value, (__u32 *)arg);
+               error = get_user(value, argp);
                if (!error)
                        error = set_backlight_level(value);
                return error;
@@ -2943,9 +2944,9 @@ pmu_ioctl(struct inode * inode, struct file *filp,
 #endif /* CONFIG_INPUT_ADBHID */
 #endif /* CONFIG_PMAC_BACKLIGHT */
        case PMU_IOC_GET_MODEL:
-               return put_user(pmu_kind, (__u32 *)arg);
+               return put_user(pmu_kind, argp);
        case PMU_IOC_HAS_ADB:
-               return put_user(pmu_has_adb, (__u32 *)arg);
+               return put_user(pmu_has_adb, argp);
        }
        return -EINVAL;
 }