2 files changed, 34 insertions, 28 deletions

diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index 6a8221893256..a3d25da2f275 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -3,7 +3,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -26,6 +25,7 @@
 static unsigned long anslcd_short_delay = 80;
 static unsigned long anslcd_long_delay = 3280;
 static volatile unsigned char __iomem *anslcd_ptr;
+static DEFINE_MUTEX(anslcd_mutex);
 
 #undef DEBUG
 
@@ -65,26 +65,31 @@ anslcd_write( struct file * file, const char __user * buf,
 
         if (!access_ok(VERIFY_READ, buf, count))
                 return -EFAULT;
+
+        mutex_lock(&anslcd_mutex);
         for ( i = *ppos; count > 0; ++i, ++p, --count ) 
         {
                 char c;
                 __get_user(c, p);
                 anslcd_write_byte_data( c );
         }
+        mutex_unlock(&anslcd_mutex);
         *ppos = i;
         return p - buf;
 }
 
-static int
-anslcd_ioctl( struct inode * inode, struct file * file,
-                                unsigned int cmd, unsigned long arg )
+static long
+anslcd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         char ch, __user *temp;
+        long ret = 0;
 
 #ifdef DEBUG
         printk(KERN_DEBUG "LCD: ioctl(%d,%d)\n",cmd,arg);
 #endif
 
+        mutex_lock(&anslcd_mutex);
+
         switch ( cmd )
         {
         case ANSLCD_CLEAR:
@@ -93,7 +98,7 @@ anslcd_ioctl( struct inode * inode, struct file * file,
                 anslcd_write_byte_ctrl ( 0x06 );
                 anslcd_write_byte_ctrl ( 0x01 );
                 anslcd_write_byte_ctrl ( 0x02 );
-                return 0;
+                break;
         case ANSLCD_SENDCTRL:
                 temp = (char __user *) arg;
                 __get_user(ch, temp);
@@ -101,33 +106,37 @@ anslcd_ioctl( struct inode * inode, struct file * file,
                         anslcd_write_byte_ctrl ( ch );
                         __get_user(ch, temp);
                 }
-                return 0;
+                break;
         case ANSLCD_SETSHORTDELAY:
                 if (!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-                anslcd_short_delay=arg;
-                return 0;
+                        ret =-EACCES;
+                else
+                        anslcd_short_delay=arg;
+                break;
         case ANSLCD_SETLONGDELAY:
                 if (!capable(CAP_SYS_ADMIN))
-                        return -EACCES;
-                anslcd_long_delay=arg;
-                return 0;
+                        ret = -EACCES;
+                else
+                        anslcd_long_delay=arg;
+                break;
         default:
-                return -EINVAL;
+                ret = -EINVAL;
         }
+
+        mutex_unlock(&anslcd_mutex);
+        return ret;
 }
 
 static int
 anslcd_open( struct inode * inode, struct file * file )
 {
-        cycle_kernel_lock();
         return 0;
 }
 
 const struct file_operations anslcd_fops = {
-        .write  = anslcd_write,
-        .ioctl  = anslcd_ioctl,
-        .open   = anslcd_open,
+        .write          = anslcd_write,
+        .unlocked_ioctl = anslcd_ioctl,
+        .open           = anslcd_open,
 };
 
 static struct miscdevice anslcd_dev = {
@@ -168,6 +177,7 @@ anslcd_init(void)
         printk(KERN_DEBUG "LCD: init\n");
 #endif
 
+        mutex_lock(&anslcd_mutex);
         anslcd_write_byte_ctrl ( 0x38 );
         anslcd_write_byte_ctrl ( 0x0c );
         anslcd_write_byte_ctrl ( 0x06 );
@@ -176,6 +186,7 @@ anslcd_init(void)
         for(a=0;a<80;a++) {
                 anslcd_write_byte_data(anslcd_logo[a]);
         }
+        mutex_unlock(&anslcd_mutex);
         return 0;
 }
 
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index cc9f27514aef..7b4ef5bb556b 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -27,54 +27,49 @@ static int mouse_last_keycode;
 /* file(s) in /proc/sys/dev/mac_hid */
 static ctl_table mac_hid_files[] = {
         {
-                .ctl_name       = DEV_MAC_HID_MOUSE_BUTTON_EMULATION,
                 .procname       = "mouse_button_emulation",
                 .data           = &mouse_emulate_buttons,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE,
                 .procname       = "mouse_button2_keycode",
                 .data           = &mouse_button2_keycode,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE,
                 .procname       = "mouse_button3_keycode",
                 .data           = &mouse_button3_keycode,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 /* dir in /proc/sys/dev */
 static ctl_table mac_hid_dir[] = {
         {
-                .ctl_name       = DEV_MAC_HID,
                 .procname       = "mac_hid",
                 .maxlen         = 0,
                 .mode           = 0555,
                 .child          = mac_hid_files,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 /* /proc/sys/dev itself, in case that is not there yet */
 static ctl_table mac_hid_root_dir[] = {
         {
-                .ctl_name       = CTL_DEV,
                 .procname       = "dev",
                 .maxlen         = 0,
                 .mode           = 0555,
                 .child          = mac_hid_dir,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table_header *mac_hid_sysctl_header;