V4L/DVB (3218): Whitespace cleanups

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb / ttpci / av7110_hw.c

diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 1220826696c5f2ba2a50a69e0b81a183c847f6a3..54279aaa4828c6dac82786af75535656a4ea47e6 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -41,6 +41,8 @@
 #include "av7110.h"
 #include "av7110_hw.h"
 
+#define _NOHANDSHAKE
+
 /****************************************************************************
  * DEBI functions
  ****************************************************************************/
@@ -364,7 +366,8 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
                msleep(1);
        }
 
-       wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0xffff, 2);
+       if (FW_VERSION(av7110->arm_app) <= 0x261f)
+               wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0xffff, 2);
 
 #ifndef _NOHANDSHAKE
        start = jiffies;
@@ -437,7 +440,8 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 
        wdebi(av7110, DEBINOSWAP, COMMAND, (u32) buf[0], 2);
 
-       wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0x0000, 2);
+       if (FW_VERSION(av7110->arm_app) <= 0x261f)
+               wdebi(av7110, DEBINOSWAP, COM_IF_LOCK, 0x0000, 2);
 
 #ifdef COM_DEBUG
        start = jiffies;
@@ -1199,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
 
 int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap)
 {
-        switch (cap->cmd) {
-        case OSD_CAP_MEMSIZE:
-                if (FW_4M_SDRAM(av7110->arm_app))
-                        cap->val = 1000000;
-                else
-                        cap->val = 92000;
-                return 0;
-        default:
-                return -EINVAL;
-        }
+       switch (cap->cmd) {
+       case OSD_CAP_MEMSIZE:
+               if (FW_4M_SDRAM(av7110->arm_app))
+                       cap->val = 1000000;
+               else
+                       cap->val = 92000;
+               return 0;
+       default:
+               return -EINVAL;
+       }
 }
 #endif /* CONFIG_DVB_AV7110_OSD */