Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / drivers / staging / frontier / alphatrack.c

diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index a50a215..4e52105 100644 (file)
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -134,7 +134,7 @@ MODULE_PARM_DESC(min_interrupt_out_interval,
 /* Structure to hold all of our device specific stuff */
 
 struct usb_alphatrack {
-       struct semaphore sem;   /* locks this structure */
+       struct mutex mtx;       /* locks this structure */
        struct usb_interface *intf;     /* save off the usb interface pointer */
        int open_count;         /* number of times this port has been opened */
 
@@ -238,7 +238,7 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
        if (urb->actual_length != INPUT_CMD_SIZE) {
                dev_warn(&dev->intf->dev,
                         "Urb length was %d bytes!!"
-                        "Do something intelligent \n", urb->actual_length);
+                        "Do something intelligent\n", urb->actual_length);
        } else {
                alphatrack_ocmd_info(&dev->intf->dev,
                                     &(*dev->ring_buffer)[dev->ring_tail].cmd,
@@ -347,7 +347,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
        }
 
        /* lock this device */
-       if (down_interruptible(&dev->sem)) {
+       if (mutex_lock_interruptible(&dev->mtx)) {
                retval = -ERESTARTSYS;
                goto unlock_disconnect_exit;
        }
@@ -390,7 +390,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
        file->private_data = dev;
 
 unlock_exit:
-       up(&dev->sem);
+       mutex_unlock(&dev->mtx);
 
 unlock_disconnect_exit:
        mutex_unlock(&disconnect_mutex);
@@ -413,7 +413,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
                goto exit;
        }
 
-       if (down_interruptible(&dev->sem)) {
+       if (mutex_lock_interruptible(&dev->mtx)) {
                retval = -ERESTARTSYS;
                goto exit;
        }
@@ -425,7 +425,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
 
        if (dev->intf == NULL) {
                /* the device was unplugged before the file was released */
-               up(&dev->sem);
+               mutex_unlock(&dev->mtx);
                /* unlock here as usb_alphatrack_delete frees dev */
                usb_alphatrack_delete(dev);
                retval = -ENODEV;
@@ -441,7 +441,7 @@ static int usb_alphatrack_release(struct inode *inode, struct file *file)
        dev->open_count = 0;
 
 unlock_exit:
-       up(&dev->sem);
+       mutex_unlock(&dev->mtx);
 
 exit:
        return retval;
@@ -486,7 +486,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer,
                goto exit;
 
        /* lock this object */
-       if (down_interruptible(&dev->sem)) {
+       if (mutex_lock_interruptible(&dev->mtx)) {
                retval = -ERESTARTSYS;
                goto exit;
        }
@@ -532,7 +532,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer,
 
 unlock_exit:
        /* unlock the device */
-       up(&dev->sem);
+       mutex_unlock(&dev->mtx);
 
 exit:
        return retval;
@@ -556,7 +556,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
                goto exit;
 
        /* lock this object */
-       if (down_interruptible(&dev->sem)) {
+       if (mutex_lock_interruptible(&dev->mtx)) {
                retval = -ERESTARTSYS;
                goto exit;
        }
@@ -599,7 +599,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
        }
 
        if (dev->interrupt_out_endpoint == NULL) {
-               err("Endpoint should not be be null! \n");
+               err("Endpoint should not be be null!\n");
                goto unlock_exit;
        }
 
@@ -627,7 +627,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
 
 unlock_exit:
        /* unlock the device */
-       up(&dev->sem);
+       mutex_unlock(&dev->mtx);
 
 exit:
        return retval;
@@ -678,7 +678,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
                dev_err(&intf->dev, "Out of memory\n");
                goto exit;
        }
-       init_MUTEX(&dev->sem);
+       mutex_init(&dev->mtx);
        dev->intf = intf;
        init_waitqueue_head(&dev->read_wait);
        init_waitqueue_head(&dev->write_wait);
@@ -771,7 +771,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
            kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
 
        if (!dev->write_buffer) {
-               dev_err(&intf->dev, "Couldn't allocate write_buffer \n");
+               dev_err(&intf->dev, "Couldn't allocate write_buffer\n");
                goto error;
        }
 
@@ -835,7 +835,7 @@ static void usb_alphatrack_disconnect(struct usb_interface *intf)
        dev = usb_get_intfdata(intf);
        usb_set_intfdata(intf, NULL);
 
-       down(&dev->sem);
+       mutex_lock(&dev->mtx);
 
        minor = intf->minor;
 
@@ -844,11 +844,11 @@ static void usb_alphatrack_disconnect(struct usb_interface *intf)
 
        /* if the device is not opened, then we clean up right now */
        if (!dev->open_count) {
-               up(&dev->sem);
+               mutex_unlock(&dev->mtx);
                usb_alphatrack_delete(dev);
        } else {
                dev->intf = NULL;
-               up(&dev->sem);
+               mutex_unlock(&dev->mtx);
        }
 
        atomic_set(&dev->writes_pending, 0);