Rename WARN() to WARNING() to clear the namespace

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / printer.c

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 76be75e3ab8fe4a051240b8c37e7f15c8558edba..e0090085b78ee74824ff2a3940a419a129e9570b 100644 (file)
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -179,7 +179,7 @@ module_param(qlen, uint, S_IRUGO|S_IWUSR);
 
 #define ERROR(dev, fmt, args...) \
        xprintk(dev, KERN_ERR, fmt, ## args)
-#define WARN(dev, fmt, args...) \
+#define WARNING(dev, fmt, args...) \
        xprintk(dev, KERN_WARNING, fmt, ## args)
 #define INFO(dev, fmt, args...) \
        xprintk(dev, KERN_INFO, fmt, ## args)
@@ -462,6 +462,7 @@ printer_open(struct inode *inode, struct file *fd)
        unsigned long           flags;
        int                     ret = -EBUSY;
 
+       lock_kernel();
        dev = container_of(inode->i_cdev, struct printer_dev, printer_cdev);
 
        spin_lock_irqsave(&dev->lock, flags);
@@ -477,7 +478,7 @@ printer_open(struct inode *inode, struct file *fd)
        spin_unlock_irqrestore(&dev->lock, flags);
 
        DBG(dev, "printer_open returned %x\n", ret);
-
+       unlock_kernel();
        return ret;
 }
 
@@ -827,9 +828,8 @@ printer_poll(struct file *fd, poll_table *wait)
        return status;
 }
 
-static int
-printer_ioctl(struct inode *inode, struct file *fd, unsigned int code,
-               unsigned long arg)
+static long
+printer_ioctl(struct file *fd, unsigned int code, unsigned long arg)
 {
        struct printer_dev      *dev = fd->private_data;
        unsigned long           flags;
@@ -868,7 +868,7 @@ static struct file_operations printer_io_operations = {
        .write =        printer_write,
        .fsync =        printer_fsync,
        .poll =         printer_poll,
-       .ioctl =        printer_ioctl,
+       .unlocked_ioctl = printer_ioctl,
        .release =      printer_close
 };
 
@@ -1360,8 +1360,8 @@ printer_bind(struct usb_gadget *gadget)
 
 
        /* Setup the sysfs files for the printer gadget. */
-       dev->pdev = device_create(usb_gadget_class, NULL, g_printer_devno,
-                       "g_printer");
+       dev->pdev = device_create_drvdata(usb_gadget_class, NULL,
+                                         g_printer_devno, NULL, "g_printer");
        if (IS_ERR(dev->pdev)) {
                ERROR(dev, "Failed to create device: g_printer\n");
                goto fail;