include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / char / ppdev.c

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 3aab837..fdd3754 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -64,9 +64,11 @@
 #include <linux/parport.h>
 #include <linux/ctype.h>
 #include <linux/poll.h>
+#include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/ppdev.h>
-#include <asm/uaccess.h>
+#include <linux/smp_lock.h>
+#include <linux/uaccess.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
 #define CHRDEV "ppdev"
@@ -113,8 +115,7 @@ static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
 
        if (!(pp->flags & PP_CLAIMED)) {
                /* Don't have the port claimed */
-               printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                       minor);
+               pr_debug(CHRDEV "%x: claim the port first\n", minor);
                return -EINVAL;
        }
 
@@ -197,8 +198,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
 
        if (!(pp->flags & PP_CLAIMED)) {
                /* Don't have the port claimed */
-               printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                       minor);
+               pr_debug(CHRDEV "%x: claim the port first\n", minor);
                return -EINVAL;
        }
 
@@ -312,7 +312,7 @@ static int register_device (int minor, struct pp_struct *pp)
        }
 
        pp->pdev = pdev;
-       printk (KERN_DEBUG "%s: registered pardevice\n", name);
+       pr_debug("%s: registered pardevice\n", name);
        return 0;
 }
 
@@ -327,10 +327,9 @@ static enum ieee1284_phase init_phase (int mode)
        return IEEE1284_PH_FWD_IDLE;
 }
 
-static int pp_ioctl(struct inode *inode, struct file *file,
-                   unsigned int cmd, unsigned long arg)
+static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       unsigned int minor = iminor(inode);
+       unsigned int minor = iminor(file->f_path.dentry->d_inode);
        struct pp_struct *pp = file->private_data;
        struct parport * port;
        void __user *argp = (void __user *)arg;
@@ -343,8 +342,7 @@ static int pp_ioctl(struct inode *inode, struct file *file,
                int ret;
 
                if (pp->flags & PP_CLAIMED) {
-                       printk (KERN_DEBUG CHRDEV
-                               "%x: you've already got it!\n", minor);
+                       pr_debug(CHRDEV "%x: you've already got it!\n", minor);
                        return -EINVAL;
                }
 
@@ -379,7 +377,7 @@ static int pp_ioctl(struct inode *inode, struct file *file,
            }
        case PPEXCL:
                if (pp->pdev) {
-                       printk (KERN_DEBUG CHRDEV "%x: too late for PPEXCL; "
+                       pr_debug(CHRDEV "%x: too late for PPEXCL; "
                                "already registered\n", minor);
                        if (pp->flags & PP_EXCL)
                                /* But it's not really an error. */
@@ -491,8 +489,7 @@ static int pp_ioctl(struct inode *inode, struct file *file,
        /* Everything else requires the port to be claimed, so check
         * that now. */
        if ((pp->flags & PP_CLAIMED) == 0) {
-               printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                       minor);
+               pr_debug(CHRDEV "%x: claim the port first\n", minor);
                return -EINVAL;
        }
 
@@ -624,8 +621,7 @@ static int pp_ioctl(struct inode *inode, struct file *file,
                return 0;
 
        default:
-               printk (KERN_DEBUG CHRDEV "%x: What? (cmd=0x%x)\n", minor,
-                       cmd);
+               pr_debug(CHRDEV "%x: What? (cmd=0x%x)\n", minor, cmd);
                return -EINVAL;
        }
 
@@ -633,11 +629,21 @@ static int pp_ioctl(struct inode *inode, struct file *file,
        return 0;
 }
 
+static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+       long ret;
+       lock_kernel();
+       ret = pp_do_ioctl(file, cmd, arg);
+       unlock_kernel();
+       return ret;
+}
+
 static int pp_open (struct inode * inode, struct file * file)
 {
        unsigned int minor = iminor(inode);
        struct pp_struct *pp;
 
+       cycle_kernel_lock();
        if (minor >= PARPORT_MAX)
                return -ENXIO;
 
@@ -688,9 +694,8 @@ static int pp_release (struct inode * inode, struct file * file)
        }
        if (compat_negot) {
                parport_negotiate (pp->pdev->port, IEEE1284_MODE_COMPAT);
-               printk (KERN_DEBUG CHRDEV
-                       "%x: negotiated back to compatibility mode because "
-                       "user-space forgot\n", minor);
+               pr_debug(CHRDEV "%x: negotiated back to compatibility "
+                       "mode because user-space forgot\n", minor);
        }
 
        if (pp->flags & PP_CLAIMED) {
@@ -703,7 +708,7 @@ static int pp_release (struct inode * inode, struct file * file)
                info->phase = pp->saved_state.phase;
                parport_release (pp->pdev);
                if (compat_negot != 1) {
-                       printk (KERN_DEBUG CHRDEV "%x: released pardevice "
+                       pr_debug(CHRDEV "%x: released pardevice "
                                "because user-space forgot\n", minor);
                }
        }
@@ -713,8 +718,7 @@ static int pp_release (struct inode * inode, struct file * file)
                parport_unregister_device (pp->pdev);
                kfree (name);
                pp->pdev = NULL;
-               printk (KERN_DEBUG CHRDEV "%x: unregistered pardevice\n",
-                       minor);
+               pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);
        }
 
        kfree (pp);
@@ -743,7 +747,7 @@ static const struct file_operations pp_fops = {
        .read           = pp_read,
        .write          = pp_write,
        .poll           = pp_poll,
-       .ioctl          = pp_ioctl,
+       .unlocked_ioctl = pp_ioctl,
        .open           = pp_open,
        .release        = pp_release,
 };
@@ -751,7 +755,7 @@ static const struct file_operations pp_fops = {
 static void pp_attach(struct parport *port)
 {
        device_create(ppdev_class, port->dev, MKDEV(PP_MAJOR, port->number),
-                       "parport%d", port->number);
+                     NULL, "parport%d", port->number);
 }
 
 static void pp_detach(struct parport *port)