4 files changed, 38 insertions, 36 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d36369e9e88f..1aa61bf29ad6 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -54,7 +54,6 @@
 #include <linux/i2c.h>
 
 #include <asm/system.h>
-#include <asm/semaphore.h>
 
 #include <linux/dvb/frontend.h>
 
@@ -242,10 +241,10 @@ static int arm_thread(void *data)
                 if (!av7110->arm_ready)
                         continue;
 
-                if (down_interruptible(&av7110->dcomlock))
+                if (mutex_lock_interruptible(&av7110->dcomlock))
                         break;
                 newloops = rdebi(av7110, DEBINOSWAP, STATUS_LOOPS, 0, 2);
-                up(&av7110->dcomlock);
+                mutex_unlock(&av7110->dcomlock);
 
                 if (newloops == av7110->arm_loops || av7110->arm_errors > 3) {
                         printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
@@ -253,10 +252,10 @@ static int arm_thread(void *data)
 
                         recover_arm(av7110);
 
-                        if (down_interruptible(&av7110->dcomlock))
+                        if (mutex_lock_interruptible(&av7110->dcomlock))
                                 break;
                         newloops = rdebi(av7110, DEBINOSWAP, STATUS_LOOPS, 0, 2) - 1;
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                 }
                 av7110->arm_loops = newloops;
                 av7110->arm_errors = 0;
@@ -741,7 +740,7 @@ int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
         int ret = 0;
         dprintk(4, "%p\n", av7110);
 
-        if (down_interruptible(&av7110->pid_mutex))
+        if (mutex_lock_interruptible(&av7110->pid_mutex))
                 return -ERESTARTSYS;
 
         if (!(vpid & 0x8000))
@@ -760,7 +759,7 @@ int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
                 ret = SetPIDs(av7110, vpid, apid, ttpid, subpid, pcrpid);
         }
 
-        up(&av7110->pid_mutex);
+        mutex_unlock(&av7110->pid_mutex);
         return ret;
 }
 
@@ -2096,7 +2095,7 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
         if (av7110->playing)
                 return 0;
 
-        if (down_interruptible(&av7110->pid_mutex))
+        if (mutex_lock_interruptible(&av7110->pid_mutex))
                 return -ERESTARTSYS;
 
         if (synced) {
@@ -2118,7 +2117,7 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
         if (!ret)
                 av7110->fe_synced = synced;
 
-        up(&av7110->pid_mutex);
+        mutex_unlock(&av7110->pid_mutex);
         return ret;
 }
 
@@ -2713,16 +2712,16 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
         tasklet_init (&av7110->debi_tasklet, debiirq, (unsigned long) av7110);
         tasklet_init (&av7110->gpio_tasklet, gpioirq, (unsigned long) av7110);
 
-        sema_init(&av7110->pid_mutex, 1);
+        mutex_init(&av7110->pid_mutex);
 
         /* locks for data transfers from/to AV7110 */
         spin_lock_init(&av7110->debilock);
-        sema_init(&av7110->dcomlock, 1);
+        mutex_init(&av7110->dcomlock);
         av7110->debitype = -1;
 
         /* default OSD window */
         av7110->osdwin = 1;
-        sema_init(&av7110->osd_sema, 1);
+        mutex_init(&av7110->osd_mutex);
 
         /* ARM "watchdog" */
         init_waitqueue_head(&av7110->arm_wait);
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index fafd25fab835..3e2e12124bae 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -16,6 +16,7 @@
 #include <linux/dvb/ca.h>
 #include <linux/dvb/osd.h>
 #include <linux/dvb/net.h>
+#include <linux/mutex.h>
 
 #include "dvbdev.h"
 #include "demux.h"
@@ -127,7 +128,7 @@ struct av7110 {
         /* DEBI and polled command interface */
 
         spinlock_t              debilock;
-        struct semaphore        dcomlock;
+        struct mutex            dcomlock;
         volatile int            debitype;
         volatile int            debilen;
 
@@ -146,7 +147,7 @@ struct av7110 {
 
         int                     osdwin;      /* currently active window */
         u16                     osdbpp[8];
-        struct semaphore        osd_sema;
+        struct mutex            osd_mutex;
 
         /* CA */
 
@@ -172,7 +173,7 @@ struct av7110 {
         struct tasklet_struct   vpe_tasklet;
 
         int                     fe_synced;
-        struct semaphore        pid_mutex;
+        struct mutex            pid_mutex;
 
         int                     video_blank;
         struct video_status     videostate;
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index b2e63e9fc053..3c5366d15a8a 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -324,10 +324,10 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
         start = jiffies;
         for (;;) {
                 err = time_after(jiffies, start + ARM_WAIT_FREE);
-                if (down_interruptible(&av7110->dcomlock))
+                if (mutex_lock_interruptible(&av7110->dcomlock))
                         return -ERESTARTSYS;
                 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
-                up(&av7110->dcomlock);
+                mutex_unlock(&av7110->dcomlock);
                 if ((stat & flags) == 0)
                         break;
                 if (err) {
@@ -484,11 +484,11 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
                 dprintk(1, "arm not ready.\n");
                 return -1;
         }
-        if (down_interruptible(&av7110->dcomlock))
+        if (mutex_lock_interruptible(&av7110->dcomlock))
                 return -ERESTARTSYS;
 
         ret = __av7110_send_fw_cmd(av7110, buf, length);
-        up(&av7110->dcomlock);
+        mutex_unlock(&av7110->dcomlock);
         if (ret && ret!=-ERESTARTSYS)
                 printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
                        __FUNCTION__, ret);
@@ -560,11 +560,11 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                 return -1;
         }
 
-        if (down_interruptible(&av7110->dcomlock))
+        if (mutex_lock_interruptible(&av7110->dcomlock))
                 return -ERESTARTSYS;
 
         if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) {
-                up(&av7110->dcomlock);
+                mutex_unlock(&av7110->dcomlock);
                 printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err);
                 return err;
         }
@@ -576,7 +576,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                         break;
                 if (err) {
                         printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                         return -ETIMEDOUT;
                 }
 #ifdef _NOHANDSHAKE
@@ -592,7 +592,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
                         break;
                 if (err) {
                         printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                         return -ETIMEDOUT;
                 }
                 msleep(1);
@@ -603,12 +603,12 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
         stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
         if (stat & GPMQOver) {
                 printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);
-                up(&av7110->dcomlock);
+                mutex_unlock(&av7110->dcomlock);
                 return -1;
         }
         else if (stat & OSDQOver) {
                 printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);
-                up(&av7110->dcomlock);
+                mutex_unlock(&av7110->dcomlock);
                 return -1;
         }
 #endif
@@ -616,7 +616,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
         for (i = 0; i < reply_buf_len; i++)
                 reply_buf[i] = rdebi(av7110, DEBINOSWAP, COM_BUFF + 2 * i, 0, 2);
 
-        up(&av7110->dcomlock);
+        mutex_unlock(&av7110->dcomlock);
         return 0;
 }
 
@@ -732,7 +732,7 @@ static int FlushText(struct av7110 *av7110)
         unsigned long start;
         int err;
 
-        if (down_interruptible(&av7110->dcomlock))
+        if (mutex_lock_interruptible(&av7110->dcomlock))
                 return -ERESTARTSYS;
         start = jiffies;
         while (1) {
@@ -742,12 +742,12 @@ static int FlushText(struct av7110 *av7110)
                 if (err) {
                         printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
                                __FUNCTION__);
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                         return -ETIMEDOUT;
                 }
                 msleep(1);
         }
-        up(&av7110->dcomlock);
+        mutex_unlock(&av7110->dcomlock);
         return 0;
 }
 
@@ -758,7 +758,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
         int length = strlen(buf) + 1;
         u16 cbuf[5] = { (COMTYPE_OSD << 8) + DText, 3, win, x, y };
 
-        if (down_interruptible(&av7110->dcomlock))
+        if (mutex_lock_interruptible(&av7110->dcomlock))
                 return -ERESTARTSYS;
 
         start = jiffies;
@@ -769,7 +769,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
                 if (ret) {
                         printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
                                __FUNCTION__);
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                         return -ETIMEDOUT;
                 }
                 msleep(1);
@@ -783,7 +783,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
                 if (ret) {
                         printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
                                __FUNCTION__);
-                        up(&av7110->dcomlock);
+                        mutex_unlock(&av7110->dcomlock);
                         return -ETIMEDOUT;
                 }
                 msleep(1);
@@ -795,7 +795,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
         if (length & 1)
                 wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i * 2, 0, 2);
         ret = __av7110_send_fw_cmd(av7110, cbuf, 5);
-        up(&av7110->dcomlock);
+        mutex_unlock(&av7110->dcomlock);
         if (ret && ret!=-ERESTARTSYS)
                 printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret);
         return ret;
@@ -1059,7 +1059,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
 {
         int ret;
 
-        if (down_interruptible(&av7110->osd_sema))
+        if (mutex_lock_interruptible(&av7110->osd_mutex))
                 return -ERESTARTSYS;
 
         switch (dc->cmd) {
@@ -1195,7 +1195,7 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
                 break;
         }
 
-        up(&av7110->osd_sema);
+        mutex_unlock(&av7110->osd_mutex);
         if (ret==-ERESTARTSYS)
                 dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd);
         else if (ret)
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index c7bb63c4d98d..4ac0f4d08025 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -10,6 +10,8 @@
 #include "dvb_net.h"
 
 #include <linux/module.h>
+#include <linux/mutex.h>
+
 #include <media/saa7146.h>
 
 extern int budget_debug;
@@ -51,7 +53,7 @@ struct budget {
         struct dmx_frontend mem_frontend;
 
         int fe_synced;
-        struct semaphore pid_mutex;
+        struct mutex pid_mutex;
 
         int ci_present;
         int video_port;