1 files changed, 22 insertions, 24 deletions

diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 7448e386a804..d79d05f88705 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -84,8 +84,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 {
         int err;
 
-        if (!dev->dmasound.bufsize)
-                BUG();
+        BUG_ON(!dev->dmasound.bufsize);
         videobuf_dma_init(&dev->dmasound.dma);
         err = videobuf_dma_init_kernel(&dev->dmasound.dma, PCI_DMA_FROMDEVICE,
                                        (dev->dmasound.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
@@ -96,8 +95,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 
 static int dsp_buffer_free(struct saa7134_dev *dev)
 {
-        if (!dev->dmasound.blksize)
-                BUG();
+        BUG_ON(!dev->dmasound.blksize);
         videobuf_dma_free(&dev->dmasound.dma);
         dev->dmasound.blocks  = 0;
         dev->dmasound.blksize = 0;
@@ -254,7 +252,7 @@ static int dsp_open(struct inode *inode, struct file *file)
         if (NULL == dev)
                 return -ENODEV;
 
-        down(&dev->dmasound.lock);
+        mutex_lock(&dev->dmasound.lock);
         err = -EBUSY;
         if (dev->dmasound.users_dsp)
                 goto fail1;
@@ -270,13 +268,13 @@ static int dsp_open(struct inode *inode, struct file *file)
         if (0 != err)
                 goto fail2;
 
-        up(&dev->dmasound.lock);
+        mutex_unlock(&dev->dmasound.lock);
         return 0;
 
  fail2:
         dev->dmasound.users_dsp--;
  fail1:
-        up(&dev->dmasound.lock);
+        mutex_unlock(&dev->dmasound.lock);
         return err;
 }
 
@@ -284,13 +282,13 @@ static int dsp_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        down(&dev->dmasound.lock);
+        mutex_lock(&dev->dmasound.lock);
         if (dev->dmasound.recording_on)
                 dsp_rec_stop(dev);
         dsp_buffer_free(dev);
         dev->dmasound.users_dsp--;
         file->private_data = NULL;
-        up(&dev->dmasound.lock);
+        mutex_unlock(&dev->dmasound.lock);
         return 0;
 }
 
@@ -304,7 +302,7 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
         int err,ret = 0;
 
         add_wait_queue(&dev->dmasound.wq, &wait);
-        down(&dev->dmasound.lock);
+        mutex_lock(&dev->dmasound.lock);
         while (count > 0) {
                 /* wait for data if needed */
                 if (0 == dev->dmasound.read_count) {
@@ -328,12 +326,12 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
                                         ret = -EAGAIN;
                                 break;
                         }
-                        up(&dev->dmasound.lock);
+                        mutex_unlock(&dev->dmasound.lock);
                         set_current_state(TASK_INTERRUPTIBLE);
                         if (0 == dev->dmasound.read_count)
                                 schedule();
                         set_current_state(TASK_RUNNING);
-                        down(&dev->dmasound.lock);
+                        mutex_lock(&dev->dmasound.lock);
                         if (signal_pending(current)) {
                                 if (0 == ret)
                                         ret = -EINTR;
@@ -362,7 +360,7 @@ static ssize_t dsp_read(struct file *file, char __user *buffer,
                 if (dev->dmasound.read_offset == dev->dmasound.bufsize)
                         dev->dmasound.read_offset = 0;
         }
-        up(&dev->dmasound.lock);
+        mutex_unlock(&dev->dmasound.lock);
         remove_wait_queue(&dev->dmasound.wq, &wait);
         return ret;
 }
@@ -435,13 +433,13 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
         case SNDCTL_DSP_STEREO:
                 if (get_user(val, p))
                         return -EFAULT;
-                down(&dev->dmasound.lock);
+                mutex_lock(&dev->dmasound.lock);
                 dev->dmasound.channels = val ? 2 : 1;
                 if (dev->dmasound.recording_on) {
                         dsp_rec_stop(dev);
                         dsp_rec_start(dev);
                 }
-                up(&dev->dmasound.lock);
+                mutex_unlock(&dev->dmasound.lock);
                 return put_user(dev->dmasound.channels-1, p);
 
         case SNDCTL_DSP_CHANNELS:
@@ -449,13 +447,13 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                         return -EFAULT;
                 if (val != 1 && val != 2)
                         return -EINVAL;
-                down(&dev->dmasound.lock);
+                mutex_lock(&dev->dmasound.lock);
                 dev->dmasound.channels = val;
                 if (dev->dmasound.recording_on) {
                         dsp_rec_stop(dev);
                         dsp_rec_start(dev);
                 }
-                up(&dev->dmasound.lock);
+                mutex_unlock(&dev->dmasound.lock);
                 /* fall through */
         case SOUND_PCM_READ_CHANNELS:
                 return put_user(dev->dmasound.channels, p);
@@ -478,13 +476,13 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                 case AFMT_U16_BE:
                 case AFMT_S16_LE:
                 case AFMT_S16_BE:
-                        down(&dev->dmasound.lock);
+                        mutex_lock(&dev->dmasound.lock);
                         dev->dmasound.afmt = val;
                         if (dev->dmasound.recording_on) {
                                 dsp_rec_stop(dev);
                                 dsp_rec_start(dev);
                         }
-                        up(&dev->dmasound.lock);
+                        mutex_unlock(&dev->dmasound.lock);
                         return put_user(dev->dmasound.afmt, p);
                 default:
                         return -EINVAL;
@@ -509,10 +507,10 @@ static int dsp_ioctl(struct inode *inode, struct file *file,
                 return 0;
 
         case SNDCTL_DSP_RESET:
-                down(&dev->dmasound.lock);
+                mutex_lock(&dev->dmasound.lock);
                 if (dev->dmasound.recording_on)
                         dsp_rec_stop(dev);
-                up(&dev->dmasound.lock);
+                mutex_unlock(&dev->dmasound.lock);
                 return 0;
         case SNDCTL_DSP_GETBLKSIZE:
                 return put_user(dev->dmasound.blksize, p);
@@ -556,10 +554,10 @@ static unsigned int dsp_poll(struct file *file, struct poll_table_struct *wait)
         poll_wait(file, &dev->dmasound.wq, wait);
 
         if (0 == dev->dmasound.read_count) {
-                down(&dev->dmasound.lock);
+                mutex_lock(&dev->dmasound.lock);
                 if (!dev->dmasound.recording_on)
                         dsp_rec_start(dev);
-                up(&dev->dmasound.lock);
+                mutex_unlock(&dev->dmasound.lock);
         } else
                 mask |= (POLLIN | POLLRDNORM);
         return mask;
@@ -852,7 +850,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev)
                 return -1;
 
         /* general */
-        init_MUTEX(&dev->dmasound.lock);
+        mutex_init(&dev->dmasound.lock);
         init_waitqueue_head(&dev->dmasound.wq);
 
         switch (dev->pci->device) {