1 files changed, 20 insertions, 20 deletions

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(): "