USB: remove info() macro from usb/misc drivers

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / rio500.c

diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 330c18e390b8f101ef45ad38ec5a283d20e42f7e..deb95bb49fd195d333a77152e21fef88f2d26ae3 100644 (file)
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -89,7 +89,7 @@ static int open_rio(struct inode *inode, struct file *file)
 
        mutex_unlock(&(rio->lock));
 
-       info("Rio opened.");
+       dev_info(&rio->rio_dev->dev, "Rio opened.\n");
 
        return 0;
 }
@@ -100,13 +100,11 @@ static int close_rio(struct inode *inode, struct file *file)
 
        rio->isopen = 0;
 
-       info("Rio closed.");
+       dev_info(&rio->rio_dev->dev, "Rio closed.\n");
        return 0;
 }
 
-static int
-ioctl_rio(struct inode *inode, struct file *file, unsigned int cmd,
-         unsigned long arg)
+static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct RioCommand rio_cmd;
        struct rio_usb_data *rio = &rio_instance;
@@ -116,6 +114,7 @@ ioctl_rio(struct inode *inode, struct file *file, unsigned int cmd,
        int retries;
        int retval=0;
 
+       lock_kernel();
        mutex_lock(&(rio->lock));
         /* Sanity check to make sure rio is connected, powered, etc */
         if (rio->present == 0 || rio->rio_dev == NULL) {
@@ -254,6 +253,7 @@ ioctl_rio(struct inode *inode, struct file *file, unsigned int cmd,
 
 err_out:
        mutex_unlock(&(rio->lock));
+       unlock_kernel();
        return retval;
 }
 
@@ -433,7 +433,7 @@ file_operations usb_rio_fops = {
        .owner =        THIS_MODULE,
        .read =         read_rio,
        .write =        write_rio,
-       .ioctl =        ioctl_rio,
+       .unlocked_ioctl = ioctl_rio,
        .open =         open_rio,
        .release =      close_rio,
 };
@@ -451,7 +451,7 @@ static int probe_rio(struct usb_interface *intf,
        struct rio_usb_data *rio = &rio_instance;
        int retval;
 
-       info("USB Rio found at address %d", dev->devnum);
+       dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
 
        retval = usb_register_dev(intf, &usb_rio_class);
        if (retval) {
@@ -503,7 +503,7 @@ static void disconnect_rio(struct usb_interface *intf)
                kfree(rio->ibuf);
                kfree(rio->obuf);
 
-               info("USB Rio disconnected.");
+               dev_info(&intf->dev, "USB Rio disconnected.\n");
 
                rio->present = 0;
                mutex_unlock(&(rio->lock));
@@ -531,7 +531,8 @@ static int __init usb_rio_init(void)
        if (retval)
                goto out;
 
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
 
 out:
        return retval;