Merge branch 'work'

3 files changed, 37 insertions, 37 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 06b696e9acbd..54f8b95717b0 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -33,7 +33,7 @@
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
-
+#include <linux/mutex.h>
 #include "dvbdev.h"
 
 static int dvbdev_debug;
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(dvbdev_debug, "Turn on/off device debugging (default:off).");
 #define dprintk if (dvbdev_debug) printk
 
 static LIST_HEAD(dvb_adapter_list);
-static DECLARE_MUTEX(dvbdev_register_lock);
+static DEFINE_MUTEX(dvbdev_register_lock);
 
 static const char * const dnames[] = {
         "video", "audio", "sec", "frontend", "demux", "dvr", "ca",
@@ -202,11 +202,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         struct dvb_device *dvbdev;
         int id;
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
 
         if ((id = dvbdev_get_free_id (adap, type)) < 0) {
-                up (&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 *pdvbdev = NULL;
                 printk ("%s: could get find free device id...\n", __FUNCTION__);
                 return -ENFILE;
@@ -215,11 +215,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
         *pdvbdev = dvbdev = kmalloc(sizeof(struct dvb_device), GFP_KERNEL);
 
         if (!dvbdev) {
-                up(&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 return -ENOMEM;
         }
 
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
 
         memcpy(dvbdev, template, sizeof(struct dvb_device));
         dvbdev->type = type;
@@ -289,11 +289,11 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
 {
         int num;
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
 
         if ((num = dvbdev_get_free_adapter_num ()) < 0) {
-                up (&dvbdev_register_lock);
+                mutex_unlock(&dvbdev_register_lock);
                 return -ENFILE;
         }
 
@@ -309,7 +309,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu
 
         list_add_tail (&adap->list_head, &dvb_adapter_list);
 
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
 
         return num;
 }
@@ -320,10 +320,10 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
 {
         devfs_remove("dvb/adapter%d", adap->num);
 
-        if (down_interruptible (&dvbdev_register_lock))
+        if (mutex_lock_interruptible(&dvbdev_register_lock))
                 return -ERESTARTSYS;
         list_del (&adap->list_head);
-        up (&dvbdev_register_lock);
+        mutex_unlock(&dvbdev_register_lock);
         return 0;
 }
 EXPORT_SYMBOL(dvb_unregister_adapter);
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index cb377452b57d..b2e63e9fc053 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -146,52 +146,52 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
 {
         int i;
         int blocks, rest;
-        u32 base, bootblock = BOOT_BLOCK;
+        u32 base, bootblock = AV7110_BOOT_BLOCK;
 
         dprintk(4, "%p\n", av7110);
 
-        blocks = len / BOOT_MAX_SIZE;
-        rest = len % BOOT_MAX_SIZE;
+        blocks = len / AV7110_BOOT_MAX_SIZE;
+        rest = len % AV7110_BOOT_MAX_SIZE;
         base = DRAM_START_CODE;
 
         for (i = 0; i < blocks; i++) {
-                if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
+                if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
                         printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at block %d\n", i);
                         return -ETIMEDOUT;
                 }
                 dprintk(4, "writing DRAM block %d\n", i);
                 mwdebi(av7110, DEBISWAB, bootblock,
-                       ((char*)data) + i * BOOT_MAX_SIZE, BOOT_MAX_SIZE);
+                       ((char*)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE);
                 bootblock ^= 0x1400;
-                iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4);
-                iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, BOOT_MAX_SIZE, 2);
-                iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
-                base += BOOT_MAX_SIZE;
+                iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
+                iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2);
+                iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
+                base += AV7110_BOOT_MAX_SIZE;
         }
 
         if (rest > 0) {
-                if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
+                if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
                         printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at last block\n");
                         return -ETIMEDOUT;
                 }
                 if (rest > 4)
                         mwdebi(av7110, DEBISWAB, bootblock,
-                               ((char*)data) + i * BOOT_MAX_SIZE, rest);
+                               ((char*)data) + i * AV7110_BOOT_MAX_SIZE, rest);
                 else
                         mwdebi(av7110, DEBISWAB, bootblock,
-                               ((char*)data) + i * BOOT_MAX_SIZE - 4, rest + 4);
+                               ((char*)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4);
 
-                iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4);
-                iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, rest, 2);
-                iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
+                iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
+                iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2);
+                iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
         }
-        if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
+        if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
                 printk(KERN_ERR "dvb-ttpci: load_dram(): timeout after last block\n");
                 return -ETIMEDOUT;
         }
-        iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, 0, 2);
-        iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
-        if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BOOT_COMPLETE) < 0) {
+        iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, 0, 2);
+        iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
+        if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_AV7110_BOOT_COMPLETE) < 0) {
                 printk(KERN_ERR "dvb-ttpci: load_dram(): final handshake timeout\n");
                 return -ETIMEDOUT;
         }
@@ -262,7 +262,7 @@ int av7110_bootarm(struct av7110 *av7110)
         //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT);
 
         mwdebi(av7110, DEBISWAB, DPRAM_BASE, bootcode, sizeof(bootcode));
-        iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
+        iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
 
         if (saa7146_wait_for_debi_done(av7110->dev, 1)) {
                 printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): "
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 84b83299b8be..4e173c67fbb2 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -18,7 +18,7 @@ enum av7110_bootstate
 {
         BOOTSTATE_BUFFER_EMPTY  = 0,
         BOOTSTATE_BUFFER_FULL   = 1,
-        BOOTSTATE_BOOT_COMPLETE = 2
+        BOOTSTATE_AV7110_BOOT_COMPLETE  = 2
 };
 
 enum av7110_type_rec_play_format
@@ -295,11 +295,11 @@ enum av7110_command_type {
 #define DPRAM_BASE 0x4000
 
 /* boot protocol area */
-#define BOOT_STATE      (DPRAM_BASE + 0x3F8)
-#define BOOT_SIZE       (DPRAM_BASE + 0x3FA)
-#define BOOT_BASE       (DPRAM_BASE + 0x3FC)
-#define BOOT_BLOCK      (DPRAM_BASE + 0x400)
-#define BOOT_MAX_SIZE   0xc00
+#define AV7110_BOOT_STATE       (DPRAM_BASE + 0x3F8)
+#define AV7110_BOOT_SIZE        (DPRAM_BASE + 0x3FA)
+#define AV7110_BOOT_BASE        (DPRAM_BASE + 0x3FC)
+#define AV7110_BOOT_BLOCK       (DPRAM_BASE + 0x400)
+#define AV7110_BOOT_MAX_SIZE    0xc00
 
 /* firmware command protocol area */
 #define IRQ_STATE       (DPRAM_BASE + 0x0F4)