V4L/DVB (11596): stv090x: fixes some register definitions

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/stv090x_reg.h b/drivers/media/dvb/frontends/stv090x_reg.h
index 0dff56d..5573707 100644 (file)
--- a/drivers/media/dvb/frontends/stv090x_reg.h
+++ b/drivers/media/dvb/frontends/stv090x_reg.h
@@ -470,7 +470,7 @@
 
 #define STV090x_FSKTCTRL                       0xf175
 #define STV090x_OFFST_FSKT_EN_SGN_FIELD                6
-#define STV090x_WIDTH_FSKT_EN_SGN__FIELD       1
+#define STV090x_WIDTH_FSKT_EN_SGN_FIELD                1
 #define STV090x_OFFST_FSKT_MOD_SGN_FIELD       5
 #define STV090x_WIDTH_FSKT_MOD_SGN_FIELD       1
 #define STV090x_OFFST_FSKT_MOD_EN_FIELD                2
@@ -616,7 +616,7 @@
 #define STV090x_OFFST_Px_CONT_TONE_FIELD       4
 #define STV090x_WIDTH_Px_CONT_TONE_FIELD       1
 #define STV090x_OFFST_Px_FIFO_4BREADY_FIELD    3
-#define STV090x_WIDTH_Px_FIFO_4BREADYFIELD     2
+#define STV090x_WIDTH_Px_FIFO_4BREADY_FIELD    2
 #define STV090x_OFFST_Px_FIFO_EMPTY_FIELD      2
 #define STV090x_WIDTH_Px_FIFO_EMPTY_FIELD      1
 #define STV090x_OFFST_Px_ABORT_DISRX_FIELD     0
@@ -1385,8 +1385,8 @@
 #define STV090x_WIDTH_Px_CAR2S2_16A_ALPH_E_FIELD       4
 
 #define STV090x_Px_ACLC2S232A(__x)             (0xf499 - (__x - 1) * 0x200)
-#define STV090x_P1_ACLC2S232A                  STV090x_Px_ACLC2S216A(1)
-#define STV090x_P2_ACLC2S232A                  STV090x_Px_ACLC2S216A(2)
+#define STV090x_P1_ACLC2S232A                  STV090x_Px_ACLC2S232A(1)
+#define STV090x_P2_ACLC2S232A                  STV090x_Px_ACLC2S232A(2)
 #define STV090x_OFFST_Px_CAR2S2_32A_ALPH_M_FIELD       4
 #define STV090x_WIDTH_Px_CAR2S2_32A_ALPH_M_FIELD       2
 #define STV090x_OFFST_Px_CAR2S2_32A_ALPH_E_FIELD       0
@@ -1720,7 +1720,7 @@
 
 #define STV090x_Px_VTH34(__x)                  (0xf536 - (__x - 1) * 0x200)
 #define STV090x_P1_VTH34                       STV090x_Px_VTH34(1)
-       #define STV090x_P2_VTH34                STV090x_Px_VTH34(2)
+#define STV090x_P2_VTH34                       STV090x_Px_VTH34(2)
 #define STV090x_OFFST_Px_VTH34_FIELD           0
 #define STV090x_WIDTH_Px_VTH34_FIELD           8
 
@@ -1763,7 +1763,7 @@
 #define STV090x_WIDTH_Px_E7_8VIT_FIELD         1
 #define STV090x_OFFST_Px_E6_7VIT_FIELD         4
 #define STV090x_WIDTH_Px_E6_7VIT_FIELD         1
-#define STV090x_OFFST_Px_E5_6VIT_FIELD_                3
+#define STV090x_OFFST_Px_E5_6VIT_FIELD         3
 #define STV090x_WIDTH_Px_E5_6VIT_FIELD         1
 #define STV090x_OFFST_Px_E3_4VIT_FIELD         2
 #define STV090x_WIDTH_Px_E3_4VIT_FIELD         1
@@ -1856,13 +1856,13 @@
 #define STV090x_OFFST_Px_UNLCK_THRESH_FIELD            4
 #define STV090x_WIDTH_Px_UNLCK_THRESH_FIELD            4
 #define STV090x_OFFST_Px_DELIN_LCK_THRESH_FIELD                0
-#define STV090x_WIDTH_Px_DELIN_LCK_THRESH__FIELD       4
+#define STV090x_WIDTH_Px_DELIN_LCK_THRESH_FIELD                4
 
 #define STV090x_Px_ISIENTRY(__x)               (0xf55e - (__x - 1) * 0x200)
 #define STV090x_P1_ISIENTRY                    STV090x_Px_ISIENTRY(1)
 #define STV090x_P2_ISIENTRY                    STV090x_Px_ISIENTRY(2)
 #define STV090x_OFFST_Px_ISI_ENTRY_FIELD       0
-#define STV090x_WIDTH_Px_ISI_ENTRY__FIELD      8
+#define STV090x_WIDTH_Px_ISI_ENTRY_FIELD       8
 
 #define STV090x_Px_ISIBITENA(__x)              (0xf55f - (__x - 1) * 0x200)
 #define STV090x_P1_ISIBITENA                   STV090x_Px_ISIBITENA(1)
@@ -1968,7 +1968,7 @@
 #define STV090x_OFFST_NBITER_STOP_CRIT_FIELD           0
 #define STV090x_WIDTH_NBITER_STOP_CRIT_FIELD           4
 
-#define STV090x_GAINLLR_NFx(__x)                               (0xFA43 + (__x - 4) * 0x1)
+#define STV090x_GAINLLR_NFx(__x)                       (0xFA43 + (__x - 4) * 0x1)
 #define STV090x_GAINLLR_NF4                            STV090x_GAINLLR_NFx(4)
 #define STV090x_OFFST_GAINLLR_NF_QP_1_2_FIELD          0
 #define STV090x_WIDTH_GAINLLR_NF_QP_1_2_FIELD          7
@@ -1999,7 +1999,7 @@
 
 #define STV090x_GAINLLR_NF11                           STV090x_GAINLLR_NFx(11)
 #define STV090x_OFFST_GAINLLR_NF_QP_9_10_FIELD         0
-#define STV090x_WIDTH_GAINLLR_NF_QP_9_10IELD           7
+#define STV090x_WIDTH_GAINLLR_NF_QP_9_10_FIELD         7
 
 #define STV090x_GAINLLR_NF12                           STV090x_GAINLLR_NFx(12)
 #define STV090x_OFFST_GAINLLR_NF_8P_3_5_FIELD          0
@@ -2079,7 +2079,7 @@
 #define STV090x_OFFST_Px_TSFIFO_PERMDATA_FIELD         5
 #define STV090x_WIDTH_Px_TSFIFO_PERMDATA_FIELD         1
 #define STV090x_OFFST_Px_TSFIFO_INVDATA_FIELD          0
-#define STV090x_WIDTH_Px_TSFIFO_INVDATA__FIELD         1
+#define STV090x_WIDTH_Px_TSFIFO_INVDATA_FIELD          1
 
 #define STV090x_Px_TSCFGL(__x)                         (0xF574 - (__x - 1) * 0x200)
 #define STV090x_P1_TSCFGL                              STV090x_Px_TSCFGL(1)
@@ -2089,7 +2089,7 @@
 #define STV090x_OFFST_Px_BCHERROR_MODE_FIELD           4
 #define STV090x_WIDTH_Px_BCHERROR_MODE_FIELD           2
 #define STV090x_OFFST_Px_TSFIFO_NSGNL2DATA_FIELD       3
-#define STV090x_WIDTH_Px_TSFIFO_NSGNL2DATA__FIELD      1
+#define STV090x_WIDTH_Px_TSFIFO_NSGNL2DATA_FIELD       1
 #define STV090x_OFFST_Px_TSFIFO_EMBINDVB_FIELD         2
 #define STV090x_WIDTH_Px_TSFIFO_EMBINDVB_FIELD         1
 #define STV090x_OFFST_Px_TSFIFO_DPUNACT_FIELD          1
@@ -2150,7 +2150,7 @@
 #define STV090x_Px_ERRCNT12(__x)                       (0xF599 - (__x - 1) * 0x200)
 #define STV090x_P1_ERRCNT12                            STV090x_Px_ERRCNT12(1)
 #define STV090x_P2_ERRCNT12                            STV090x_Px_ERRCNT12(2)
-#define STV090x_OFFST_Px_ERRCNT1_OLDVALUE__FIELD       7
+#define STV090x_OFFST_Px_ERRCNT1_OLDVALUE_FIELD                7
 #define STV090x_WIDTH_Px_ERRCNT1_OLDVALUE_FIELD                1
 #define STV090x_OFFST_Px_ERR_CNT12_FIELD               0
 #define STV090x_WIDTH_Px_ERR_CNT12_FIELD               7
@@ -2249,7 +2249,7 @@
 #define STV090x_P1_FBERCPT4                            STV090x_Px_FBERCPT4(1)
 #define STV090x_P2_FBERCPT4                            STV090x_Px_FBERCPT4(2)
 #define STV090x_OFFST_Px_FBERMETER_CPT_FIELD           0
-#define STV090x_WIDTH_Px_BERMETER_CPT_FIELD            8
+#define STV090x_WIDTH_Px_FBERMETER_CPT_FIELD           8
 
 #define STV090x_Px_FBERCPT3(__x)                       (0xF5A9 - (__x - 1) * 0x200)
 #define STV090x_P1_FBERCPT3                            STV090x_Px_FBERCPT3(1)