Merge branch 'bkl-removal' into next

[pandora-kernel.git] / drivers / char / lp.c

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 81674d7..71abb4c 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -126,6 +126,7 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/jiffies.h>
+#include <linux/smp_lock.h>
 
 #include <linux/parport.h>
 #undef LP_STATS
@@ -312,7 +313,7 @@ static ssize_t lp_write(struct file * file, const char __user * buf,
        if (copy_size > LP_BUFFER_SIZE)
                copy_size = LP_BUFFER_SIZE;
 
-       if (down_interruptible (&lp_table[minor].port_mutex))
+       if (mutex_lock_interruptible(&lp_table[minor].port_mutex))
                return -EINTR;
 
        if (copy_from_user (kbuf, buf, copy_size)) {
@@ -399,7 +400,7 @@ static ssize_t lp_write(struct file * file, const char __user * buf,
                lp_release_parport (&lp_table[minor]);
        }
 out_unlock:
-       up (&lp_table[minor].port_mutex);
+       mutex_unlock(&lp_table[minor].port_mutex);
 
        return retv;
 }
@@ -421,7 +422,7 @@ static ssize_t lp_read(struct file * file, char __user * buf,
        if (count > LP_BUFFER_SIZE)
                count = LP_BUFFER_SIZE;
 
-       if (down_interruptible (&lp_table[minor].port_mutex))
+       if (mutex_lock_interruptible(&lp_table[minor].port_mutex))
                return -EINTR;
 
        lp_claim_parport_or_block (&lp_table[minor]);
@@ -479,7 +480,7 @@ static ssize_t lp_read(struct file * file, char __user * buf,
        if (retval > 0 && copy_to_user (buf, kbuf, retval))
                retval = -EFAULT;
 
-       up (&lp_table[minor].port_mutex);
+       mutex_unlock(&lp_table[minor].port_mutex);
 
        return retval;
 }
@@ -489,14 +490,21 @@ static ssize_t lp_read(struct file * file, char __user * buf,
 static int lp_open(struct inode * inode, struct file * file)
 {
        unsigned int minor = iminor(inode);
+       int ret = 0;
 
-       if (minor >= LP_NO)
-               return -ENXIO;
-       if ((LP_F(minor) & LP_EXIST) == 0)
-               return -ENXIO;
-       if (test_and_set_bit(LP_BUSY_BIT_POS, &LP_F(minor)))
-               return -EBUSY;
-
+       lock_kernel();
+       if (minor >= LP_NO) {
+               ret = -ENXIO;
+               goto out;
+       }
+       if ((LP_F(minor) & LP_EXIST) == 0) {
+               ret = -ENXIO;
+               goto out;
+       }
+       if (test_and_set_bit(LP_BUSY_BIT_POS, &LP_F(minor))) {
+               ret = -EBUSY;
+               goto out;
+       }
        /* If ABORTOPEN is set and the printer is offline or out of paper,
           we may still want to open it to perform ioctl()s.  Therefore we
           have commandeered O_NONBLOCK, even though it is being used in
@@ -510,21 +518,25 @@ static int lp_open(struct inode * inode, struct file * file)
                if (status & LP_POUTPA) {
                        printk(KERN_INFO "lp%d out of paper\n", minor);
                        LP_F(minor) &= ~LP_BUSY;
-                       return -ENOSPC;
+                       ret = -ENOSPC;
+                       goto out;
                } else if (!(status & LP_PSELECD)) {
                        printk(KERN_INFO "lp%d off-line\n", minor);
                        LP_F(minor) &= ~LP_BUSY;
-                       return -EIO;
+                       ret = -EIO;
+                       goto out;
                } else if (!(status & LP_PERRORP)) {
                        printk(KERN_ERR "lp%d printer error\n", minor);
                        LP_F(minor) &= ~LP_BUSY;
-                       return -EIO;
+                       ret = -EIO;
+                       goto out;
                }
        }
        lp_table[minor].lp_buffer = kmalloc(LP_BUFFER_SIZE, GFP_KERNEL);
        if (!lp_table[minor].lp_buffer) {
                LP_F(minor) &= ~LP_BUSY;
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto out;
        }
        /* Determine if the peripheral supports ECP mode */
        lp_claim_parport_or_block (&lp_table[minor]);
@@ -540,7 +552,9 @@ static int lp_open(struct inode * inode, struct file * file)
        parport_negotiate (lp_table[minor].dev->port, IEEE1284_MODE_COMPAT);
        lp_release_parport (&lp_table[minor]);
        lp_table[minor].current_mode = IEEE1284_MODE_COMPAT;
-       return 0;
+out:
+       unlock_kernel();
+       return ret;
 }
 
 static int lp_release(struct inode * inode, struct file * file)
@@ -888,7 +902,7 @@ static int __init lp_init (void)
                lp_table[i].last_error = 0;
                init_waitqueue_head (&lp_table[i].waitq);
                init_waitqueue_head (&lp_table[i].dataq);
-               init_MUTEX (&lp_table[i].port_mutex);
+               mutex_init(&lp_table[i].port_mutex);
                lp_table[i].timeout = 10 * HZ;
        }