lgdt3306a: Fix several sparse/smatch/CodingStyle issues
cover lgdt3306a: Fix several sparse/smatch/CodingStyle issues
The submitted lgdt3306a driver was not in a good shape for merging. However, as most of the issues are trivial, I solved them.
There are still a few remaining issues:
- As reported by checkpatch.pl:
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
Who will maintain it?
- There's currently no driver using this demod;
- It is still using DVBv3 stats. I can fix it, but I need the patches that will add support for the boards that use this demod in order to take a look on it;
- It uses its own log implementation.
For now, I'll be merging this on a topic branch, until the above issues get fixed.
Mauro Carvalho Chehab (13):
[media] lgdt3306a: Use hexadecimal values in lowercase [media] lgdt3306a: Use IS_ENABLED() for attach function [media] lgdt3306a: one bit fields should be unsigned [media] lgdt3306a: don't go past the buffer [media] lgdt3306a: properly handle I/O errors [media] lgdt3306a: Remove FSF address
[media] lbdt3306a: rework at printk macros [media] lbdt3306a: simplify the lock status check [media] lgdt3306a: Don't use else were not needed [media] lbdt3306a: remove uneeded braces [media] lgdt3306a: constify log tables
[media] lgdt3306a: Break long lines
[media] lgdt3306a: Minor source code cleanups
drivers/media/dvb-frontends/lgdt3306a.c | 979 ++++++++++++++++++-------------- drivers/media/dvb-frontends/lgdt3306a.h | 18 +- 2 files changed, 549 insertions(+), 448 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/13 lgdt3306a: Use hexadecimal values in lowercase
While this is not a mandatory rule at the CodingStyle, we prefer hexadecimal values in lowercase. Currently, there's a mix of lowercase and uppercase ons at lgdt3306a. So, convert all to lowercase with this small script:
perl -ne 'if (m,0x([\dA-F]+),) { $o=$1; $n=lc $1; s,0x($o),0x$n, } print $_'drivers/media/dvb-frontends/lgdt3306a.c +230 -230
@@ -80,7 +80,7 @@ struct lgdt3306a_state {enum lgdt3306a_lock_status {LG3306_UNLOCK =0x00 ,LG3306_LOCK =0x01 , -LG3306_UNKNOWN_LOCK =0xFF +LG3306_UNKNOWN_LOCK =0xff };enum lgdt3306a_neverlock_status {
@@ -88,14 +88,14 @@ enum lgdt3306a_neverlock_status {LG3306_NL_PROCESS =0x01 ,LG3306_NL_LOCK =0x02 ,LG3306_NL_FAIL =0x03 , -LG3306_NL_UNKNOWN =0xFF +LG3306_NL_UNKNOWN =0xff };enum lgdt3306a_modulation {LG3306_VSB =0x00 ,LG3306_QAM64 =0x01 ,LG3306_QAM256 =0x02 , -LG3306_UNKNOWN_MODE =0xFF +LG3306_UNKNOWN_MODE =0xff }; enum lgdt3306a_lock_check {
@@ -284,7 +284,7 @@ static int lgdt3306a_mpeg_tristate(struct lgdt3306a_state *state, ret =lgdt3306a_read_reg (state,0x0070 , &val);if (lg_chkerr (ret)) goto fail; - val &= ~0xA8 ;/* Tristate bus; TPOUTEN=0x80, TPCLKOUTEN=0x20, TPDATAOUTEN=0x08 */ + val &= ~0xa8 ;/* Tristate bus; TPOUTEN=0x80, TPCLKOUTEN=0x20, TPDATAOUTEN=0x08 */ ret =lgdt3306a_write_reg (state,0x0070 , val);if (lg_chkerr (ret)) goto fail;
@@ -302,7 +302,7 @@ static int lgdt3306a_mpeg_tristate(struct lgdt3306a_state *state,if (lg_chkerr (ret)) goto fail; - val |=0xA8 ;/* enable bus */ + val |=0xa8 ;/* enable bus */ ret =lgdt3306a_write_reg (state,0x0070 , val);if (lg_chkerr (ret)) goto fail;
@@ -365,7 +365,7 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state)/* 0. Spectrum inversion detection manual; spectrum inverted */ ret =lgdt3306a_read_reg (state,0x0002 , &val); - val &=0xF7 ;/* SPECINVAUTO Off */ + val &=0xf7 ;/* SPECINVAUTO Off */ val |=0x04 ;/* SPECINV On */ ret =lgdt3306a_write_reg (state,0x0002 , val);if (lg_chkerr (ret))
@@ -378,23 +378,23 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state)/* 2. Bandwidth mode for VSB(6MHz) */ ret =lgdt3306a_read_reg (state,0x0009 , &val); - val &=0xE3 ; - val |=0x0C ;/* STDOPDETTMODE[2:0]=3 */ + val &=0xe3 ; + val |=0x0c ;/* STDOPDETTMODE[2:0]=3 */ ret =lgdt3306a_write_reg (state,0x0009 , val);if (lg_chkerr (ret)) goto fail;/* 3. QAM mode detection mode(None) */ ret =lgdt3306a_read_reg (state,0x0009 , &val); - val &=0xFC ;/* STDOPDETCMODE[1:0]=0 */ + val &=0xfc ;/* STDOPDETCMODE[1:0]=0 */ ret =lgdt3306a_write_reg (state,0x0009 , val);if (lg_chkerr (ret)) goto fail;/* 4. ADC sampling frequency rate(2x sampling) */ - ret =lgdt3306a_read_reg (state,0x000D , &val); - val &=0xBF ;/* SAMPLING4XFEN=0 */ - ret =lgdt3306a_write_reg (state,0x000D , val); + ret =lgdt3306a_read_reg (state,0x000d , &val); + val &=0xbf ;/* SAMPLING4XFEN=0 */ + ret =lgdt3306a_write_reg (state,0x000d , val);if (lg_chkerr (ret)) goto fail;
@@ -406,19 +406,19 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state) goto fail;/* AICCFIXFREQ0 NT N-1(Video rejection) */ - ret =lgdt3306a_write_reg (state,0x002E ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002F ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002e ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002f ,0x00 ); ret =lgdt3306a_write_reg (state,0x0030 ,0x00 );/* AICCFIXFREQ1 NT N-1(Audio rejection) */ - ret =lgdt3306a_write_reg (state,0x002B ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002C ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002D ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002b ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002c ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002d ,0x00 );/* AICCFIXFREQ2 NT Co-Channel(Video rejection) */ ret =lgdt3306a_write_reg (state,0x0028 ,0x00 ); ret =lgdt3306a_write_reg (state,0x0029 ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002A ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002a ,0x00 );/* AICCFIXFREQ3 NT Co-Channel(Audio rejection) */ ret =lgdt3306a_write_reg (state,0x0025 ,0x00 );
@@ -434,19 +434,19 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state) goto fail;/* AICCFIXFREQ0 NT N-1(Video rejection) */ - ret =lgdt3306a_write_reg (state,0x002E ,0x5A ); - ret =lgdt3306a_write_reg (state,0x002F ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002e ,0x5A ); + ret =lgdt3306a_write_reg (state,0x002f ,0x00 ); ret =lgdt3306a_write_reg (state,0x0030 ,0x00 );/* AICCFIXFREQ1 NT N-1(Audio rejection) */ - ret =lgdt3306a_write_reg (state,0x002B ,0x36 ); - ret =lgdt3306a_write_reg (state,0x002C ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002D ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002b ,0x36 ); + ret =lgdt3306a_write_reg (state,0x002c ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002d ,0x00 );/* AICCFIXFREQ2 NT Co-Channel(Video rejection) */ ret =lgdt3306a_write_reg (state,0x0028 ,0x2A ); ret =lgdt3306a_write_reg (state,0x0029 ,0x00 ); - ret =lgdt3306a_write_reg (state,0x002A ,0x00 ); + ret =lgdt3306a_write_reg (state,0x002a ,0x00 );/* AICCFIXFREQ3 NT Co-Channel(Audio rejection) */ ret =lgdt3306a_write_reg (state,0x0025 ,0x06 );
@@ -454,57 +454,57 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state) ret =lgdt3306a_write_reg (state,0x0027 ,0x00 );#endif - ret =lgdt3306a_read_reg (state,0x001E , &val); - val &=0x0F ; - val |=0xA0 ; - ret =lgdt3306a_write_reg (state,0x001E , val); + ret =lgdt3306a_read_reg (state,0x001e , &val); + val &=0x0f ; + val |=0xa0 ; + ret =lgdt3306a_write_reg (state,0x001e , val); ret =lgdt3306a_write_reg (state,0x0022 ,0x08 ); ret =lgdt3306a_write_reg (state,0x0023 ,0xFF ); - ret =lgdt3306a_read_reg (state,0x211F , &val); - val &=0xEF ; - ret =lgdt3306a_write_reg (state,0x211F , val); + ret =lgdt3306a_read_reg (state,0x211f , &val); + val &=0xef ; + ret =lgdt3306a_write_reg (state,0x211f , val); ret =lgdt3306a_write_reg (state,0x2173 ,0x01 ); ret =lgdt3306a_read_reg (state,0x1061 , &val); - val &=0xF8 ; + val &=0xf8 ; val |=0x04 ; ret =lgdt3306a_write_reg (state,0x1061 , val); - ret =lgdt3306a_read_reg (state,0x103D , &val); - val &=0xCF ; - ret =lgdt3306a_write_reg (state,0x103D , val); + ret =lgdt3306a_read_reg (state,0x103d , &val); + val &=0xcf ; + ret =lgdt3306a_write_reg (state,0x103d , val); ret =lgdt3306a_write_reg (state,0x2122 ,0x40 ); ret =lgdt3306a_read_reg (state,0x2141 , &val); - val &=0x3F ; + val &=0x3f ; ret =lgdt3306a_write_reg (state,0x2141 , val); ret =lgdt3306a_read_reg (state,0x2135 , &val); - val &=0x0F ; + val &=0x0f ; val |=0x70 ; ret =lgdt3306a_write_reg (state,0x2135 , val); ret =lgdt3306a_read_reg (state,0x0003 , &val); - val &=0xF7 ; + val &=0xf7 ; ret =lgdt3306a_write_reg (state,0x0003 , val); - ret =lgdt3306a_read_reg (state,0x001C , &val); - val &=0x7F ; - ret =lgdt3306a_write_reg (state,0x001C , val); + ret =lgdt3306a_read_reg (state,0x001c , &val); + val &=0x7f ; + ret =lgdt3306a_write_reg (state,0x001c , val);/* 6. EQ step size */ ret =lgdt3306a_read_reg (state,0x2179 , &val); - val &=0xF8 ; + val &=0xf8 ; ret =lgdt3306a_write_reg (state,0x2179 , val); - ret =lgdt3306a_read_reg (state,0x217A , &val); - val &=0xF8 ; - ret =lgdt3306a_write_reg (state,0x217A , val); + ret =lgdt3306a_read_reg (state,0x217a , &val); + val &=0xf8 ; + ret =lgdt3306a_write_reg (state,0x217a , val);/* 7. Reset */ ret =lgdt3306a_soft_reset (state);
@@ -530,7 +530,7 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation)/* 1a. Spectrum inversion detection to Auto */ ret =lgdt3306a_read_reg (state,0x0002 , &val); - val &=0xFB ;/* SPECINV Off */ + val &=0xfb ;/* SPECINV Off */ val |=0x08 ;/* SPECINVAUTO On */ ret =lgdt3306a_write_reg (state,0x0002 , val);if (lg_chkerr (ret))
@@ -538,14 +538,14 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation)/* 2. Bandwidth mode for QAM */ ret =lgdt3306a_read_reg (state,0x0009 , &val); - val &=0xE3 ;/* STDOPDETTMODE[2:0]=0 VSB Off */ + val &=0xe3 ;/* STDOPDETTMODE[2:0]=0 VSB Off */ ret =lgdt3306a_write_reg (state,0x0009 , val);if (lg_chkerr (ret)) goto fail;/* 3. : 64QAM/256QAM detection(manual, auto) */ ret =lgdt3306a_read_reg (state,0x0009 , &val); - val &=0xFC ; + val &=0xfc ; val |=0x02 ;/* STDOPDETCMODE[1:0]=1=Manual 2=Auto */ ret =lgdt3306a_write_reg (state,0x0009 , val);if (lg_chkerr (ret))
@@ -553,7 +553,7 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation)/* 3a. : 64QAM/256QAM selection for manual */ ret =lgdt3306a_read_reg (state,0x101a , &val); - val &=0xF8 ; + val &=0xf8 ;if (modulation ==QAM_64 ) val |=0x02 ;/* QMDQMODE[2:0]=2=QAM64 */ else
@@ -564,10 +564,10 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation) goto fail;/* 4. ADC sampling frequency rate(4x sampling) */ - ret =lgdt3306a_read_reg (state,0x000D , &val); - val &=0xBF ; + ret =lgdt3306a_read_reg (state,0x000d , &val); + val &=0xbf ; val |=0x40 ;/* SAMPLING4XFEN=1 */ - ret =lgdt3306a_write_reg (state,0x000D , val); + ret =lgdt3306a_write_reg (state,0x000d , val);if (lg_chkerr (ret)) goto fail;
@@ -829,7 +829,7 @@ static int lgdt3306a_init(struct dvb_frontend *fe) ret =lgdt3306a_read_reg (state,0x0005 , &val);if (lg_chkerr (ret)) goto fail; - val &=0xC0 ; + val &=0xc0 ; val |=0x25 ; ret =lgdt3306a_write_reg (state,0x0005 , val);if (lg_chkerr (ret))
@@ -839,12 +839,12 @@ static int lgdt3306a_init(struct dvb_frontend *fe) goto fail;/* 8. ADC sampling frequency(0x180000 for 24MHz sampling) */ - ret =lgdt3306a_read_reg (state,0x000D , &val); + ret =lgdt3306a_read_reg (state,0x000d , &val);if (lg_chkerr (ret)) goto fail; - val &=0xC0 ; + val &=0xc0 ; val |=0x18 ; - ret =lgdt3306a_write_reg (state,0x000D , val); + ret =lgdt3306a_write_reg (state,0x000d , val);if (lg_chkerr (ret)) goto fail;
@@ -853,7 +853,7 @@ static int lgdt3306a_init(struct dvb_frontend *fe) ret =lgdt3306a_read_reg (state,0x0005 , &val);if (lg_chkerr (ret)) goto fail; - val &=0xC0 ; + val &=0xc0 ; val |=0x25 ; ret =lgdt3306a_write_reg (state,0x0005 , val);if (lg_chkerr (ret))
@@ -863,20 +863,20 @@ static int lgdt3306a_init(struct dvb_frontend *fe) goto fail;/* 8. ADC sampling frequency(0x190000 for 25MHz sampling) */ - ret =lgdt3306a_read_reg (state,0x000D , &val); + ret =lgdt3306a_read_reg (state,0x000d , &val);if (lg_chkerr (ret)) goto fail; - val &=0xC0 ; + val &=0xc0 ; val |=0x19 ; - ret =lgdt3306a_write_reg (state,0x000D , val); + ret =lgdt3306a_write_reg (state,0x000d , val);if (lg_chkerr (ret)) goto fail; }else {lg_err ("Bad xtalMHz=%d\n" , state->cfg->xtalMHz); }#if 0 - ret =lgdt3306a_write_reg (state,0x000E ,0x00 ); - ret =lgdt3306a_write_reg (state,0x000F ,0x00 ); + ret =lgdt3306a_write_reg (state,0x000e ,0x00 ); + ret =lgdt3306a_write_reg (state,0x000f ,0x00 );#endif /* 9. Center frequency of input signal of ADC */
@@ -887,31 +887,31 @@ static int lgdt3306a_init(struct dvb_frontend *fe) ret =lgdt3306a_write_reg (state,0x0014 ,0 );/* gain error=0 */ /* 10a. VSB TR BW gear shift initial step */ - ret =lgdt3306a_read_reg (state,0x103C , &val); - val &=0x0F ; + ret =lgdt3306a_read_reg (state,0x103c , &val); + val &=0x0f ; val |=0x20 ;/* SAMGSAUTOSTL_V[3:0] = 2 */ - ret =lgdt3306a_write_reg (state,0x103C , val); + ret =lgdt3306a_write_reg (state,0x103c , val);/* 10b. Timing offset calibration in low temperature for VSB */ - ret =lgdt3306a_read_reg (state,0x103D , &val); - val &=0xFC ; + ret =lgdt3306a_read_reg (state,0x103d , &val); + val &=0xfc ; val |=0x03 ; - ret =lgdt3306a_write_reg (state,0x103D , val); + ret =lgdt3306a_write_reg (state,0x103d , val);/* 10c. Timing offset calibration in low temperature for QAM */ ret =lgdt3306a_read_reg (state,0x1036 , &val); - val &=0xF0 ; - val |=0x0C ; + val &=0xf0 ; + val |=0x0c ; ret =lgdt3306a_write_reg (state,0x1036 , val);/* 11. Using the imaginary part of CIR in CIR loading */ - ret =lgdt3306a_read_reg (state,0x211F , &val); - val &=0xEF ;/* do not use imaginary of CIR */ - ret =lgdt3306a_write_reg (state,0x211F , val); + ret =lgdt3306a_read_reg (state,0x211f , &val); + val &=0xef ;/* do not use imaginary of CIR */ + ret =lgdt3306a_write_reg (state,0x211f , val);/* 12. Control of no signal detector function */ ret =lgdt3306a_read_reg (state,0x2849 , &val); - val &=0xEF ;/* NOUSENOSIGDET=0, enable no signal detector */ + val &=0xef ;/* NOUSENOSIGDET=0, enable no signal detector */ ret =lgdt3306a_write_reg (state,0x2849 , val);/* FGR - put demod in some known mode */
@@ -1034,8 +1034,8 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)u8 snrRef, maxPowerMan, nCombDet;u16 fbDlyCir; - ret =lgdt3306a_read_reg (state,0x21A1 , &val); - snrRef = val &0x3F ; + ret =lgdt3306a_read_reg (state,0x21a1 , &val); + snrRef = val &0x3f ; ret =lgdt3306a_read_reg (state,0x2185 , &maxPowerMan);
@@ -1052,7 +1052,7 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)/* Carrier offset sub loop bandwidth */ ret =lgdt3306a_read_reg (state,0x1061 , &val); - val &=0xF8 ; + val &=0xf8 ;if ((snrRef >18 ) && (maxPowerMan >0x68 ) && (nCombDet ==0x01 ) && ((fbDlyCir ==0x03FF ) || (fbDlyCir <0x6C ))) {/* SNR is over 18dB and no ghosting */ val |=0x00 ;/* final bandwidth = 0 */
@@ -1063,17 +1063,17 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)/* Adjust Notch Filter */ ret =lgdt3306a_read_reg (state,0x0024 , &val); - val &=0x0F ; + val &=0x0f ;if (nCombDet ==0 ) {/* Turn on the Notch Filter */ val |=0x50 ; } ret =lgdt3306a_write_reg (state,0x0024 , val);/* VSB Timing Recovery output normalization */ - ret =lgdt3306a_read_reg (state,0x103D , &val); - val &=0xCF ; + ret =lgdt3306a_read_reg (state,0x103d , &val); + val &=0xcf ; val |=0x20 ; - ret =lgdt3306a_write_reg (state,0x103D , val); + ret =lgdt3306a_write_reg (state,0x103d , val); }static enum lgdt3306a_modulation lgdt3306a_check_oper_mode (struct lgdt3306a_state *state)
@@ -1088,7 +1088,7 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_statreturn LG3306_VSB ; }if (val &0x08 ) { - ret =lgdt3306a_read_reg (state,0x00A6 , &val); + ret =lgdt3306a_read_reg (state,0x00a6 , &val); val = val >>2 ;if (val &0x01 ) {lg_dbg ("QAM256\n" );
@@ -1115,7 +1115,7 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_sswitch (whatLock) {case LG3306_SYNC_LOCK : { - ret =lgdt3306a_read_reg (state,0x00A6 , &val); + ret =lgdt3306a_read_reg (state,0x00a6 , &val);if ((val &0x80 ) ==0x80 ) lockStatus =LG3306_LOCK ;
@@ -1200,18 +1200,18 @@ static void lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)u8 currChDiffACQ, snrRef, mainStrong, aiccrejStatus;/* Channel variation */ - ret =lgdt3306a_read_reg (state,0x21BC , &currChDiffACQ); + ret =lgdt3306a_read_reg (state,0x21bc , &currChDiffACQ);/* SNR of Frame sync */ - ret =lgdt3306a_read_reg (state,0x21A1 , &val); - snrRef = val &0x3F ; + ret =lgdt3306a_read_reg (state,0x21a1 , &val); + snrRef = val &0x3f ;/* Strong Main CIR */ ret =lgdt3306a_read_reg (state,0x2199 , &val); mainStrong = (val &0x40 ) >>6 ; ret =lgdt3306a_read_reg (state,0x0090 , &val); - aiccrejStatus = (val &0xF0 ) >>4 ; + aiccrejStatus = (val &0xf0 ) >>4 ;lg_dbg ("snrRef=%d mainStrong=%d aiccrejStatus=%d currChDiffACQ=0x%x\n" , snrRef, mainStrong, aiccrejStatus, currChDiffACQ);
@@ -1221,24 +1221,24 @@ static void lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)#endif if (mainStrong ==0 ) { ret =lgdt3306a_read_reg (state,0x2135 , &val); - val &=0x0F ; - val |=0xA0 ; + val &=0x0f ; + val |=0xa0 ; ret =lgdt3306a_write_reg (state,0x2135 , val); ret =lgdt3306a_read_reg (state,0x2141 , &val); - val &=0x3F ; + val &=0x3f ; val |=0x80 ; ret =lgdt3306a_write_reg (state,0x2141 , val); ret =lgdt3306a_write_reg (state,0x2122 ,0x70 ); }else {/* Weak ghost or static channel */ ret =lgdt3306a_read_reg (state,0x2135 , &val); - val &=0x0F ; + val &=0x0f ; val |=0x70 ; ret =lgdt3306a_write_reg (state,0x2135 , val); ret =lgdt3306a_read_reg (state,0x2141 , &val); - val &=0x3F ; + val &=0x3f ; val |=0x40 ; ret =lgdt3306a_write_reg (state,0x2141 , val);
@@ -1309,7 +1309,7 @@ static u8 lgdt3306a_get_packet_error(struct lgdt3306a_state *state)u8 val;int ret; - ret =lgdt3306a_read_reg (state,0x00FA , &val); + ret =lgdt3306a_read_reg (state,0x00fa , &val);return val; }
@@ -1365,10 +1365,10 @@ static u32 lgdt3306a_calculate_snr_x100(struct lgdt3306a_state *state)u32 pwr;/* Constelation power */ u32 snr_x100; - mse = (read_reg (state,0x00EC ) <<8 ) | - (read_reg (state,0x00ED )); - pwr = (read_reg (state,0x00E8 ) <<8 ) | - (read_reg (state,0x00E9 )); + mse = (read_reg (state,0x00ec ) <<8 ) | + (read_reg (state,0x00ed )); + pwr = (read_reg (state,0x00e8 ) <<8 ) | + (read_reg (state,0x00e9 ));if (mse ==0 )/* no signal */ return 0 ;
@@ -1565,10 +1565,10 @@ static int lgdt3306a_read_ber(struct dvb_frontend *fe, u32 *ber)#if 1 /* FGR - BUGBUG - I don't know what value is expected by dvb_core * what is the scale of the value?? */ - tmp =read_reg (state,0x00FC );/* NBERVALUE[24-31] */ - tmp = (tmp <<8 ) |read_reg (state,0x00FD );/* NBERVALUE[16-23] */ - tmp = (tmp <<8 ) |read_reg (state,0x00FE );/* NBERVALUE[8-15] */ - tmp = (tmp <<8 ) |read_reg (state,0x00FF );/* NBERVALUE[0-7] */ + tmp =read_reg (state,0x00fc );/* NBERVALUE[24-31] */ + tmp = (tmp <<8 ) |read_reg (state,0x00fd );/* NBERVALUE[16-23] */ + tmp = (tmp <<8 ) |read_reg (state,0x00fe );/* NBERVALUE[8-15] */ + tmp = (tmp <<8 ) |read_reg (state,0x00ff );/* NBERVALUE[0-7] */ *ber = tmp;lg_dbg ("ber=%u\n" , tmp);#endif
@@ -1583,7 +1583,7 @@ static int lgdt3306a_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)#if 1 /* FGR - BUGBUG - I don't know what value is expected by dvb_core * what happens when value wraps? */ - *ucblocks =read_reg (state,0x00F4 );/* TPIFTPERRCNT[0-7] */ + *ucblocks =read_reg (state,0x00f4 );/* TPIFTPERRCNT[0-7] */ lg_dbg ("ucblocks=%u\n" , *ucblocks);#endif
@@ -1698,8 +1698,8 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config, ret =lgdt3306a_read_reg (state,0x0001 , &val);if (lg_chkerr (ret)) goto fail; -if ((val &0xF6 ) !=0xC6 ) { -lg_warn ("expected 0xC6, got 0x%x\n" , (val &0xF6 )); +if ((val &0xf6 ) !=0xc6 ) { +lg_warn ("expected 0xc6, got 0x%x\n" , (val &0xf6 ));#if 0 goto fail;/* BUGBUG - re-enable when we know this is right */ #endif
@@ -1741,11 +1741,11 @@ static const short regtab[] = {0x0007 ,/* SYSINITWAITTIME[7:0] (msec) 00001000 */ 0x0008 ,/* STDOPMODE[7:0] 10000000 */ 0x0009 ,/* 1'b0 1'b0 1'b0 STDOPDETTMODE[2:0] STDOPDETCMODE[1:0] 00011110 */ -0x000A ,/* DAFTEN 1'b1 x x SCSYSLOCK */ -0x000B ,/* SCSYSLOCKCHKTIME[7:0] (10msec) 01100100 */ -0x000D ,/* x SAMPLING4 */ -0x000E ,/* SAMFREQ[15:8] 00000000 */ -0x000F ,/* SAMFREQ[7:0] 00000000 */ +0x000a ,/* DAFTEN 1'b1 x x SCSYSLOCK */ +0x000b ,/* SCSYSLOCKCHKTIME[7:0] (10msec) 01100100 */ +0x000d ,/* x SAMPLING4 */ +0x000e ,/* SAMFREQ[15:8] 00000000 */ +0x000f ,/* SAMFREQ[7:0] 00000000 */ 0x0010 ,/* IFFREQ[15:8] 01100000 */ 0x0011 ,/* IFFREQ[7:0] 00000000 */ 0x0012, /* AGCEN AGCREFMO */
@@ -1756,10 +1756,10 @@ static const short regtab[] = {0x0017 ,/* AGCDELAY[7:0] 00100000 */ 0x0018 ,/* AGCRFBW[3:0] AGCIFBW[3:0] 10001000 */ 0x0019 ,/* AGCUDOUTMODE[1:0] AGCUDCTRLLEN[1:0] AGCUDCTRL */ -0x001C ,/* 1'b1 PFEN MFEN AICCVSYNC */ -0x001D ,/* 1'b0 1'b1 1'b0 1'b1 AICCVSYNC */ -0x001E ,/* AICCALPHA[3:0] 1'b1 1'b0 1'b1 1'b0 01111010 */ -0x001F ,/* AICCDETTH[19:16] AICCOFFTH[19:16] 00000000 */ +0x001c ,/* 1'b1 PFEN MFEN AICCVSYNC */ +0x001d ,/* 1'b0 1'b1 1'b0 1'b1 AICCVSYNC */ +0x001e ,/* AICCALPHA[3:0] 1'b1 1'b0 1'b1 1'b0 01111010 */ +0x001f ,/* AICCDETTH[19:16] AICCOFFTH[19:16] 00000000 */ 0x0020 ,/* AICCDETTH[15:8] 01111100 */ 0x0021 ,/* AICCDETTH[7:0] 00000000 */ 0x0022, /* AICCOFFTH[15:8] 00000101 */
@@ -1770,12 +1770,12 @@ static const short regtab[] = {0x0027 ,/* AICCFIXFREQ3[7:0] 00000000 */ 0x0028 ,/* AICCFIXFREQ2[23:16] 00000000 */ 0x0029 ,/* AICCFIXFREQ2[15:8] 00000000 */ -0x002A ,/* AICCFIXFREQ2[7:0] 00000000 */ -0x002B ,/* AICCFIXFREQ1[23:16] 00000000 */ -0x002C ,/* AICCFIXFREQ1[15:8] 00000000 */ -0x002D ,/* AICCFIXFREQ1[7:0] 00000000 */ -0x002E ,/* AICCFIXFREQ0[23:16] 00000000 */ -0x002F ,/* AICCFIXFREQ0[15:8] 00000000 */ +0x002a ,/* AICCFIXFREQ2[7:0] 00000000 */ +0x002b ,/* AICCFIXFREQ1[23:16] 00000000 */ +0x002c ,/* AICCFIXFREQ1[15:8] 00000000 */ +0x002d ,/* AICCFIXFREQ1[7:0] 00000000 */ +0x002e ,/* AICCFIXFREQ0[23:16] 00000000 */ +0x002f ,/* AICCFIXFREQ0[15:8] 00000000 */ 0x0030 ,/* AICCFIXFREQ0[7:0] 00000000 */ 0x0031 ,/* 1'b0 1'b1 1'b0 1'b0 x DAGC1STER */ 0x0032, /* DAGC1STEN DAGC1STER */
@@ -1785,7 +1785,7 @@ static const short regtab[] = {0x0036 ,/* DAGC2NDREF[15:8] 00001010 */ 0x0037 ,/* DAGC2NDREF[7:0] 10000000 */ 0x0038 ,/* DAGC2NDLOCKDETRNGSEL[1:0] */ -0x003D ,/* 1'b1 SAMGEARS */ +0x003d ,/* 1'b1 SAMGEARS */ 0x0040 ,/* SAMLFGMA */ 0x0041 ,/* SAMLFBWM */ 0x0044, /* 1'b1 CRGEARSHE */
@@ -1794,7 +1794,7 @@ static const short regtab[] = {0x0047 ,/* CRLFGMAN */ 0x0048 ,/* x x x x CRLFGSTEP_VS[3:0] xxxx1001 */ 0x0049 ,/* CRLFBWMA */ -0x004A ,/* CRLFBWMA */ +0x004a ,/* CRLFBWMA */ 0x0050 ,/* 1'b0 1'b1 1'b1 1'b0 MSECALCDA */ 0x0070 ,/* TPOUTEN TPIFEN TPCLKOUTE */ 0x0071, /* TPSENB TPSSOPBITE */
@@ -1804,158 +1804,158 @@ static const short regtab[] = {0x0077 ,/* x NBERLOSTTH[2:0] NBERACQTH[3:0] x0000000 */ 0x0078 ,/* NBERPOLY[31:24] 00000000 */ 0x0079 ,/* NBERPOLY[23:16] 00000000 */ -0x007A ,/* NBERPOLY[15:8] 00000000 */ -0x007B ,/* NBERPOLY[7:0] 00000000 */ -0x007C ,/* NBERPED[31:24] 00000000 */ -0x007D ,/* NBERPED[23:16] 00000000 */ -0x007E ,/* NBERPED[15:8] 00000000 */ -0x007F ,/* NBERPED[7:0] 00000000 */ +0x007a ,/* NBERPOLY[15:8] 00000000 */ +0x007b ,/* NBERPOLY[7:0] 00000000 */ +0x007c ,/* NBERPED[31:24] 00000000 */ +0x007d ,/* NBERPED[23:16] 00000000 */ +0x007e ,/* NBERPED[15:8] 00000000 */ +0x007f ,/* NBERPED[7:0] 00000000 */ 0x0080 ,/* x AGCLOCK DAGCLOCK SYSLOCK x x NEVERLOCK[1:0] */ 0x0085 ,/* SPECINVST */ 0x0088 ,/* SYSLOCKTIME[15:8] */ 0x0089 ,/* SYSLOCKTIME[7:0] */ -0x008C ,/* FECLOCKTIME[15:8] */ -0x008D ,/* FECLOCKTIME[7:0] */ -0x008E ,/* AGCACCOUT[15:8] */ -0x008F ,/* AGCACCOUT[7:0] */ +0x008c ,/* FECLOCKTIME[15:8] */ +0x008d ,/* FECLOCKTIME[7:0] */ +0x008e ,/* AGCACCOUT[15:8] */ +0x008f ,/* AGCACCOUT[7:0] */ 0x0090 ,/* AICCREJSTATUS[3:0] AICCREJBUSY[3:0] */ 0x0091 ,/* AICCVSYNC */ -0x009C ,/* CARRFREQOFFSET[15:8] */ -0x009D ,/* CARRFREQOFFSET[7:0] */ -0x00A1 ,/* SAMFREQOFFSET[23:16] */ -0x00A2 ,/* SAMFREQOFFSET[15:8] */ -0x00A3 ,/* SAMFREQOFFSET[7:0] */ -0x00A6 ,/* SYNCLOCK SYNCLOCKH */ +0x009c ,/* CARRFREQOFFSET[15:8] */ +0x009d ,/* CARRFREQOFFSET[7:0] */ +0x00a1 ,/* SAMFREQOFFSET[23:16] */ +0x00a2 ,/* SAMFREQOFFSET[15:8] */ +0x00a3 ,/* SAMFREQOFFSET[7:0] */ +0x00a6 ,/* SYNCLOCK SYNCLOCKH */ #if 0 /* covered elsewhere */ -0x00E8 ,/* CONSTPWR[15:8] */ -0x00E9 ,/* CONSTPWR[7:0] */ -0x00EA ,/* BMSE[15:8] */ -0x00EB ,/* BMSE[7:0] */ -0x00EC ,/* MSE[15:8] */ -0x00ED ,/* MSE[7:0] */ -0x00EE ,/* CONSTI[7:0] */ -0x00EF ,/* CONSTQ[7:0] */ +0x00e8 ,/* CONSTPWR[15:8] */ +0x00e9 ,/* CONSTPWR[7:0] */ +0x00ea ,/* BMSE[15:8] */ +0x00eb ,/* BMSE[7:0] */ +0x00ec ,/* MSE[15:8] */ +0x00ed ,/* MSE[7:0] */ +0x00ee ,/* CONSTI[7:0] */ +0x00ef ,/* CONSTQ[7:0] */ #endif -0x00F4 ,/* TPIFTPERRCNT[7:0] */ -0x00F5 ,/* TPCORREC */ -0x00F6 ,/* VBBER[15:8] */ -0x00F7 ,/* VBBER[7:0] */ -0x00F8 ,/* VABER[15:8] */ -0x00F9 ,/* VABER[7:0] */ -0x00FA ,/* TPERRCNT[7:0] */ -0x00FB ,/* NBERLOCK x x x x x x x */ -0x00FC ,/* NBERVALUE[31:24] */ -0x00FD ,/* NBERVALUE[23:16] */ -0x00FE ,/* NBERVALUE[15:8] */ -0x00FF ,/* NBERVALUE[7:0] */ +0x00f4 ,/* TPIFTPERRCNT[7:0] */ +0x00f5 ,/* TPCORREC */ +0x00f6 ,/* VBBER[15:8] */ +0x00f7 ,/* VBBER[7:0] */ +0x00f8 ,/* VABER[15:8] */ +0x00f9 ,/* VABER[7:0] */ +0x00fa ,/* TPERRCNT[7:0] */ +0x00fb ,/* NBERLOCK x x x x x x x */ +0x00fc ,/* NBERVALUE[31:24] */ +0x00fd ,/* NBERVALUE[23:16] */ +0x00fe ,/* NBERVALUE[15:8] */ +0x00ff ,/* NBERVALUE[7:0] */ 0x1000 ,/* 1'b0 WODAGCOU */ 0x1005 ,/* x x 1'b1 1'b1 x SRD_Q_QM */ 0x1009 ,/* SRDWAITTIME[7:0] (10msec) 00100011 */ -0x100A ,/* SRDWAITTIME_CQS[7:0] (msec) 01100100 */ -0x101A ,/* x 1'b1 1'b0 1'b0 x QMDQAMMODE[2:0] x100x010 */ +0x100a ,/* SRDWAITTIME_CQS[7:0] (msec) 01100100 */ +0x101a ,/* x 1'b1 1'b0 1'b0 x QMDQAMMODE[2:0] x100x010 */ 0x1036 ,/* 1'b0 1'b1 1'b0 1'b0 SAMGSEND_CQS[3:0] 01001110 */ -0x103C ,/* SAMGSAUTOSTL_V[3:0] SAMGSAUTOEDL_V[3:0] 01000110 */ -0x103D ,/* 1'b1 1'b1 SAMCNORMBP_V[1:0] 1'b0 1'b0 SAMMODESEL_V[1:0] 11100001 */ -0x103F ,/* SAMZTEDSE */ -0x105D ,/* EQSTATUSE */ -0x105F ,/* x PMAPG2_V[2:0] x DMAPG2_V[2:0] x001x011 */ +0x103c ,/* SAMGSAUTOSTL_V[3:0] SAMGSAUTOEDL_V[3:0] 01000110 */ +0x103d ,/* 1'b1 1'b1 SAMCNORMBP_V[1:0] 1'b0 1'b0 SAMMODESEL_V[1:0] 11100001 */ +0x103f ,/* SAMZTEDSE */ +0x105d ,/* EQSTATUSE */ +0x105f ,/* x PMAPG2_V[2:0] x DMAPG2_V[2:0] x001x011 */ 0x1060 ,/* 1'b1 EQSTATUSE */ 0x1061 ,/* CRMAPBWSTL_V[3:0] CRMAPBWEDL_V[3:0] 00000100 */ 0x1065 ,/* 1'b0 x CRMODE_V[1:0] 1'b1 x 1'b1 x 0x111x1x */ 0x1066 ,/* 1'b0 1'b0 1'b1 1'b0 1'b1 PNBOOSTSE */ 0x1068 ,/* CREPHNGAIN2_V[3:0] CREPHNPBW_V[3:0] 10010001 */ -0x106E ,/* x x x x x CREPHNEN_ */ -0x106F ,/* CREPHNTH_V[7:0] 00010101 */ +0x106e ,/* x x x x x CREPHNEN_ */ +0x106f ,/* CREPHNTH_V[7:0] 00010101 */ 0x1072 ,/* CRSWEEPN */ 0x1073 ,/* CRPGAIN_V[3:0] x x 1'b1 1'b1 1001xx11 */ 0x1074 ,/* CRPBW_V[3:0] x x 1'b1 1'b1 0001xx11 */ 0x1080 ,/* DAFTSTATUS[1:0] x x x x x x */ 0x1081 ,/* SRDSTATUS[1:0] x x x x x SRDLOCK */ -0x10A9 ,/* EQSTATUS_CQS[1:0] x x x x x x */ -0x10B7 ,/* EQSTATUS_V[1:0] x x x x x x */ +0x10a9 ,/* EQSTATUS_CQS[1:0] x x x x x x */ +0x10b7 ,/* EQSTATUS_V[1:0] x x x x x x */ #if 0 /* SMART_ANT */ -0x1F00 ,/* MODEDETE */ -0x1F01 ,/* x x x x x x x SFNRST xxxxxxx0 */ -0x1F03 ,/* NUMOFANT[7:0] 10000000 */ -0x1F04 ,/* x SELMASK[6:0] x0000000 */ -0x1F05 ,/* x SETMASK[6:0] x0000000 */ -0x1F06 ,/* x TXDATA[6:0] x0000000 */ -0x1F07 ,/* x CHNUMBER[6:0] x0000000 */ -0x1F09 ,/* AGCTIME[23:16] 10011000 */ -0x1F0A ,/* AGCTIME[15:8] 10010110 */ -0x1F0B ,/* AGCTIME[7:0] 10000000 */ -0x1F0C ,/* ANTTIME[31:24] 00000000 */ -0x1F0D ,/* ANTTIME[23:16] 00000011 */ -0x1F0E ,/* ANTTIME[15:8] 10010000 */ -0x1F0F ,/* ANTTIME[7:0] 10010000 */ -0x1F11 ,/* SYNCTIME[23:16] 10011000 */ -0x1F12 ,/* SYNCTIME[15:8] 10010110 */ -0x1F13 ,/* SYNCTIME[7:0] 10000000 */ -0x1F14 ,/* SNRTIME[31:24] 00000001 */ -0x1F15 ,/* SNRTIME[23:16] 01111101 */ -0x1F16 ,/* SNRTIME[15:8] 01111000 */ -0x1F17 ,/* SNRTIME[7:0] 01000000 */ -0x1F19 ,/* FECTIME[23:16] 00000000 */ -0x1F1A ,/* FECTIME[15:8] 01110010 */ -0x1F1B ,/* FECTIME[7:0] 01110000 */ -0x1F1D ,/* FECTHD[7:0] 00000011 */ -0x1F1F ,/* SNRTHD[23:16] 00001000 */ -0x1F20 ,/* SNRTHD[15:8] 01111111 */ -0x1F21 ,/* SNRTHD[7:0] 10000101 */ -0x1F80 ,/* IRQFLG x x SFSDRFLG MODEBFLG SAVEFLG SCANFLG TRACKFLG */ -0x1F81 ,/* x SYNCCON SNRCON FECCON x STDBUSY SYNCRST AGCFZCO */ -0x1F82 ,/* x x x SCANOPCD[4:0] */ -0x1F83 ,/* x x x x MAINOPCD[3:0] */ -0x1F84 ,/* x x RXDATA[13:8] */ -0x1F85 ,/* RXDATA[7:0] */ -0x1F86 ,/* x x SDTDATA[13:8] */ -0x1F87 ,/* SDTDATA[7:0] */ -0x1F89 ,/* ANTSNR[23:16] */ -0x1F8A ,/* ANTSNR[15:8] */ -0x1F8B ,/* ANTSNR[7:0] */ -0x1F8C ,/* x x x x ANTFEC[13:8] */ -0x1F8D ,/* ANTFEC[7:0] */ -0x1F8E ,/* MAXCNT[7:0] */ -0x1F8F ,/* SCANCNT[7:0] */ -0x1F91 ,/* MAXPW[23:16] */ -0x1F92 ,/* MAXPW[15:8] */ -0x1F93 ,/* MAXPW[7:0] */ -0x1F95 ,/* CURPWMSE[23:16] */ -0x1F96 ,/* CURPWMSE[15:8] */ -0x1F97 ,/* CURPWMSE[7:0] */ +0x1f00 ,/* MODEDETE */ +0x1f01 ,/* x x x x x x x SFNRST xxxxxxx0 */ +0x1f03 ,/* NUMOFANT[7:0] 10000000 */ +0x1f04 ,/* x SELMASK[6:0] x0000000 */ +0x1f05 ,/* x SETMASK[6:0] x0000000 */ +0x1f06 ,/* x TXDATA[6:0] x0000000 */ +0x1f07 ,/* x CHNUMBER[6:0] x0000000 */ +0x1f09 ,/* AGCTIME[23:16] 10011000 */ +0x1f0a ,/* AGCTIME[15:8] 10010110 */ +0x1f0b ,/* AGCTIME[7:0] 10000000 */ +0x1f0c ,/* ANTTIME[31:24] 00000000 */ +0x1f0d ,/* ANTTIME[23:16] 00000011 */ +0x1f0e ,/* ANTTIME[15:8] 10010000 */ +0x1f0f ,/* ANTTIME[7:0] 10010000 */ +0x1f11 ,/* SYNCTIME[23:16] 10011000 */ +0x1f12 ,/* SYNCTIME[15:8] 10010110 */ +0x1f13 ,/* SYNCTIME[7:0] 10000000 */ +0x1f14 ,/* SNRTIME[31:24] 00000001 */ +0x1f15 ,/* SNRTIME[23:16] 01111101 */ +0x1f16 ,/* SNRTIME[15:8] 01111000 */ +0x1f17 ,/* SNRTIME[7:0] 01000000 */ +0x1f19 ,/* FECTIME[23:16] 00000000 */ +0x1f1a ,/* FECTIME[15:8] 01110010 */ +0x1f1b ,/* FECTIME[7:0] 01110000 */ +0x1f1d ,/* FECTHD[7:0] 00000011 */ +0x1f1f ,/* SNRTHD[23:16] 00001000 */ +0x1f20 ,/* SNRTHD[15:8] 01111111 */ +0x1f21 ,/* SNRTHD[7:0] 10000101 */ +0x1f80 ,/* IRQFLG x x SFSDRFLG MODEBFLG SAVEFLG SCANFLG TRACKFLG */ +0x1f81 ,/* x SYNCCON SNRCON FECCON x STDBUSY SYNCRST AGCFZCO */ +0x1f82 ,/* x x x SCANOPCD[4:0] */ +0x1f83 ,/* x x x x MAINOPCD[3:0] */ +0x1f84 ,/* x x RXDATA[13:8] */ +0x1f85 ,/* RXDATA[7:0] */ +0x1f86 ,/* x x SDTDATA[13:8] */ +0x1f87 ,/* SDTDATA[7:0] */ +0x1f89 ,/* ANTSNR[23:16] */ +0x1f8a ,/* ANTSNR[15:8] */ +0x1f8b ,/* ANTSNR[7:0] */ +0x1f8c ,/* x x x x ANTFEC[13:8] */ +0x1f8d ,/* ANTFEC[7:0] */ +0x1f8e ,/* MAXCNT[7:0] */ +0x1f8f ,/* SCANCNT[7:0] */ +0x1f91 ,/* MAXPW[23:16] */ +0x1f92 ,/* MAXPW[15:8] */ +0x1f93 ,/* MAXPW[7:0] */ +0x1f95 ,/* CURPWMSE[23:16] */ +0x1f96 ,/* CURPWMSE[15:8] */ +0x1f97 ,/* CURPWMSE[7:0] */ #endif /* SMART_ANT */ -0x211F ,/* 1'b1 1'b1 1'b1 CIRQEN x x 1'b0 1'b0 1111xx00 */ -0x212A ,/* EQAUTOST */ +0x211f ,/* 1'b1 1'b1 1'b1 CIRQEN x x 1'b0 1'b0 1111xx00 */ +0x212a ,/* EQAUTOST */ 0x2122 ,/* CHFAST[7:0] 01100000 */ -0x212B ,/* FFFSTEP_V[3:0] x FBFSTEP_V[2:0] 0001x001 */ -0x212C ,/* PHDEROTBWSEL[3:0] 1'b1 1'b1 1'b1 1'b0 10001110 */ -0x212D ,/* 1'b1 1'b1 1'b1 1'b1 x x TPIFLOCKS */ +0x212b ,/* FFFSTEP_V[3:0] x FBFSTEP_V[2:0] 0001x001 */ +0x212c ,/* PHDEROTBWSEL[3:0] 1'b1 1'b1 1'b1 1'b0 10001110 */ +0x212d ,/* 1'b1 1'b1 1'b1 1'b1 x x TPIFLOCKS */ 0x2135 ,/* DYNTRACKFDEQ[3:0] x 1'b0 1'b0 1'b0 1010x000 */ 0x2141 ,/* TRMODE[1:0] 1'b1 1'b1 1'b0 1'b1 1'b1 1'b1 01110111 */ 0x2162 ,/* AICCCTRLE */ 0x2173 ,/* PHNCNFCNT[7:0] 00000100 */ 0x2179 ,/* 1'b0 1'b0 1'b0 1'b1 x BADSINGLEDYNTRACKFBF[2:0] 0001x001 */ -0x217A ,/* 1'b0 1'b0 1'b0 1'b1 x BADSLOWSINGLEDYNTRACKFBF[2:0] 0001x001 */ -0x217E ,/* CNFCNTTPIF[7:0] 00001000 */ -0x217F ,/* TPERRCNTTPIF[7:0] 00000001 */ +0x217a ,/* 1'b0 1'b0 1'b0 1'b1 x BADSLOWSINGLEDYNTRACKFBF[2:0] 0001x001 */ +0x217e ,/* CNFCNTTPIF[7:0] 00001000 */ +0x217f ,/* TPERRCNTTPIF[7:0] 00000001 */ 0x2180 ,/* x x x x x x FBDLYCIR[9:8] */ 0x2181 ,/* FBDLYCIR[7:0] */ 0x2185 ,/* MAXPWRMAIN[7:0] */ 0x2191 ,/* NCOMBDET x x x x x x x */ 0x2199 ,/* x MAINSTRON */ -0x219A ,/* FFFEQSTEPOUT_V[3:0] FBFSTEPOUT_V[2:0] */ -0x21A1 ,/* x x SNRREF[5:0] */ +0x219a ,/* FFFEQSTEPOUT_V[3:0] FBFSTEPOUT_V[2:0] */ +0x21a1 ,/* x x SNRREF[5:0] */ 0x2845 ,/* 1'b0 1'b1 x x FFFSTEP_CQS[1:0] FFFCENTERTAP[1:0] 01xx1110 */ 0x2846 ,/* 1'b0 x 1'b0 1'b1 FBFSTEP_CQS[1:0] 1'b1 1'b0 0x011110 */ 0x2847 ,/* ENNOSIGDE */ 0x2849 ,/* 1'b1 1'b1 NOUSENOSI */ -0x284A ,/* EQINITWAITTIME[7:0] 01100100 */ +0x284a ,/* EQINITWAITTIME[7:0] 01100100 */ 0x3000 ,/* 1'b1 1'b1 1'b1 x x x 1'b0 RPTRSTM */ 0x3001 ,/* RPTRSTWAITTIME[7:0] (100msec) 00110010 */ 0x3031 ,/* FRAMELOC */ 0x3032 ,/* 1'b1 1'b0 1'b0 1'b0 x x FRAMELOCKMODE_CQS[1:0] 1000xx11 */ -0x30A9 ,/* VDLOCK_Q FRAMELOCK */ - 0x30AA, /* MPEGLOCK */ +0x30a9 ,/* VDLOCK_Q FRAMELOCK */ + 0x30aa, /* MPEGLOCK */ };#define numDumpRegs (sizeof(regtab)/sizeof(regtab[0]))
Signature · 1 line
1.9.3
PATCH 2/13 lgdt3306a: Use IS_ENABLED() for attach function
In reply to Mauro Carvalho ChehabSimplify the check if CONFIG_DVB_LGDT3306A is enabled, use the IS_ENABLED() macro, just like the other frontend modules.
drivers/media/dvb-frontends/lgdt3306a.c +1 -1
@@ -1662,7 +1662,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe)static struct dvb_frontend_ops lgdt3306a_ops;struct dvb_frontend *lgdt3306a_attach (const struct lgdt3306a_config *config, -struct i2c_adapter *i2c_adap) +struct i2c_adapter *i2c_adap) {struct lgdt3306a_state *state =NULL ;int ret;
drivers/media/dvb-frontends/lgdt3306a.h +3 -5
@@ -63,15 +63,13 @@ struct lgdt3306a_config {int xtalMHz; }; -#if defined(CONFIG_DVB_LGDT3306A ) || (defined(CONFIG_DVB_LGDT3306A_MODULE ) && \ - defined(MODULE )) -extern +#if IS_ENABLED (CONFIG_DVB_LGDT3306A )struct dvb_frontend *lgdt3306a_attach (const struct lgdt3306a_config *config, -struct i2c_adapter *i2c_adap); +struct i2c_adapter *i2c_adap);#else static inline struct dvb_frontend *lgdt3306a_attach (const struct lgdt3306a_config *config, -struct i2c_adapter *i2c_adap) +struct i2c_adapter *i2c_adap) {printk (KERN_WARNING "%s: driver disabled by Kconfig\n" , __func__);return NULL ;
Signature · 1 line
1.9.3
PATCH 3/13 lgdt3306a: one bit fields should be unsigned
In reply to Mauro Carvalho ChehabFix two smatch warnings:
drivers/media/dvb-frontends/lgdt3306a.h:53:28: error: dubious one-bit signed bitfield drivers/media/dvb-frontends/lgdt3306a.h:56:33: error: dubious one-bit signed bitfield
drivers/media/dvb-frontends/lgdt3306a.h +2 -2
@@ -50,10 +50,10 @@ struct lgdt3306a_config {u16 vsb_if_khz;/* disable i2c repeater - 0:repeater enabled 1:repeater disabled */ - int deny_i2c_rptr:1; + unsigned int deny_i2c_rptr:1;/* spectral inversion - 0:disabled 1:enabled */ - int spectral_inversion:1; + unsigned int spectral_inversion:1;enum lgdt3306a_mpeg_mode mpeg_mode;enum lgdt3306a_tp_clock_edge tpclk_edge;
Signature · 1 line
1.9.3
PATCH 4/13 lgdt3306a: don't go past the buffer
In reply to Mauro Carvalho ChehabAs warned by smatch:
drivers/media/dvb-frontends/lgdt3306a.c:1354 log10_x1000() error: buffer overflow 'valx_x10' 14 <= 14 drivers/media/dvb-frontends/lgdt3306a.c:1355 log10_x1000() error: buffer overflow 'log10x_x1000' 14 <= 14
There's a potential of returning a value out of the buffer. Fix it.
While here, remove the ugly braced block.
drivers/media/dvb-frontends/lgdt3306a.c +10 -8
@@ -1319,6 +1319,7 @@ static u32 log10_x1000(u32 x)static u32 valx_x10[] = {10 ,11 ,13 ,15 ,17 ,20 ,25 ,33 ,41 ,50 ,59 ,73 ,87 ,100 };static u32 log10x_x1000[] = {0 ,41 ,114 ,176 ,230 ,301 ,398 ,518 ,613 ,699 ,771 ,863 ,939 ,1000 };static u32 nelems =sizeof (valx_x10)/sizeof (valx_x10[0 ]); +u32 diff_val, step_val, step_log10;u32 log_val =0 ;u32 i;
@@ -1348,15 +1349,16 @@ static u32 log10_x1000(u32 x)if (valx_x10[i] >= x)break ; } +if (i == nelems) +return log_val + log10x_x1000[i -1 ]; - { -u32 diff_val = x - valx_x10[i-1 ]; -u32 step_val = valx_x10[i] - valx_x10[i-1 ]; -u32 step_log10 = log10x_x1000[i] - log10x_x1000[i-1 ]; -/* do a linear interpolation to get in-between values */ -return log_val + log10x_x1000[i-1 ] + - ((diff_val*step_log10) / step_val); - } + diff_val = x - valx_x10[i-1 ]; + step_val = valx_x10[i] - valx_x10[i -1 ]; + step_log10 = log10x_x1000[i] - log10x_x1000[i -1 ]; + +/* do a linear interpolation to get in-between values */ +return log_val + log10x_x1000[i -1 ] + + ((diff_val*step_log10) / step_val); }static u32 lgdt3306a_calculate_snr_x100 (struct lgdt3306a_state *state)
Signature · 1 line
1.9.3
PATCH 5/13 lgdt3306a: properly handle I/O errors
In reply to Mauro Carvalho ChehabFixes the following smatch errors:
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_set_if':drivers/media/dvb-frontends/lgdt3306a.c:695:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_monitor_vsb':
drivers/media/dvb-frontends/lgdt3306a.c:1033:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_check_oper_mode':
drivers/media/dvb-frontends/lgdt3306a.c:1082:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_check_lock_status':
drivers/media/dvb-frontends/lgdt3306a.c:1109:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_check_neverlock_status':
drivers/media/dvb-frontends/lgdt3306a.c:1185:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_pre_monitoring':
drivers/media/dvb-frontends/lgdt3306a.c:1199:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^
drivers/media/dvb-frontends/lgdt3306a.c: In function 'lgdt3306a_get_packet_error':
drivers/media/dvb-frontends/lgdt3306a.c:1310:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
int ret;
^drivers/media/dvb-frontends/lgdt3306a.c +79 -5
@@ -734,7 +734,11 @@ static int lgdt3306a_set_if(struct lgdt3306a_state *state,break ; } ret =lgdt3306a_write_reg (state,0x0010 , nco1); +if (ret) +return ret; ret =lgdt3306a_write_reg (state,0x0011 , nco2); +if (ret) +return ret;lg_dbg ("if_freq=%d KHz->[%04x]\n" , if_freq_khz, nco1<<8 | nco2);
@@ -1027,7 +1031,7 @@ static enum dvbfe_algo lgdt3306a_get_frontend_algo(struct dvb_frontend *fe) }/* ------------------------------------------------------------------------ */ -static void lgdt3306a_monitor_vsb (struct lgdt3306a_state *state) +static int lgdt3306a_monitor_vsb (struct lgdt3306a_state *state) {u8 val;int ret;
@@ -1035,16 +1039,27 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)u16 fbDlyCir; ret =lgdt3306a_read_reg (state,0x21a1 , &val); +if (ret) +return ret; snrRef = val &0x3f ; ret =lgdt3306a_read_reg (state,0x2185 , &maxPowerMan); +if (ret) +return ret; ret =lgdt3306a_read_reg (state,0x2191 , &val); +if (ret) +return ret; nCombDet = (val &0x80 ) >>7 ; ret =lgdt3306a_read_reg (state,0x2180 , &val); +if (ret) +return ret; fbDlyCir = (val &0x03 ) <<8 ; + ret =lgdt3306a_read_reg (state,0x2181 , &val); +if (ret) +return ret; fbDlyCir |= val; lg_dbg("snrRef=%d maxPowerMan=0x%x nCombDet=%d fbDlyCir=0x%x\n",
@@ -1052,6 +1067,8 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)/* Carrier offset sub loop bandwidth */ ret =lgdt3306a_read_reg (state,0x1061 , &val); +if (ret) +return ret; val &=0xf8 ;if ((snrRef >18 ) && (maxPowerMan >0x68 ) && (nCombDet ==0x01 ) && ((fbDlyCir ==0x03FF ) || (fbDlyCir <0x6C ))) {/* SNR is over 18dB and no ghosting */
@@ -1060,20 +1077,30 @@ static void lgdt3306a_monitor_vsb(struct lgdt3306a_state *state) val |=0x04 ;/* final bandwidth = 4 */ } ret =lgdt3306a_write_reg (state,0x1061 , val); +if (ret) +return ret;/* Adjust Notch Filter */ ret =lgdt3306a_read_reg (state,0x0024 , &val); +if (ret) +return ret; val &=0x0f ;if (nCombDet ==0 ) {/* Turn on the Notch Filter */ val |=0x50 ; } ret =lgdt3306a_write_reg (state,0x0024 , val); +if (ret) +return ret;/* VSB Timing Recovery output normalization */ ret =lgdt3306a_read_reg (state,0x103d , &val); +if (ret) +return ret; val &=0xcf ; val |=0x20 ; ret =lgdt3306a_write_reg (state,0x103d , val); + +return ret; }static enum lgdt3306a_modulation lgdt3306a_check_oper_mode (struct lgdt3306a_state *state)
@@ -1082,6 +1109,8 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_statint ret; ret =lgdt3306a_read_reg (state,0x0081 , &val); +if (ret) + goto err;if (val &0x80 ) {lg_dbg ("VSB\n" );
@@ -1089,6 +1118,8 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_stat }if (val &0x08 ) { ret =lgdt3306a_read_reg (state,0x00a6 , &val); +if (ret) + goto err; val = val >>2 ;if (val &0x01 ) {lg_dbg ("QAM256\n" );
@@ -1098,6 +1129,7 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_statreturn LG3306_QAM64 ; } } +err:lg_warn ("UNKNOWN\n" );return LG3306_UNKNOWN_MODE ; }
@@ -1116,6 +1148,8 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_scase LG3306_SYNC_LOCK : { ret =lgdt3306a_read_reg (state,0x00a6 , &val); +if (ret) +return ret;if ((val &0x80 ) ==0x80 ) lockStatus =LG3306_LOCK ;
@@ -1128,6 +1162,8 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_scase LG3306_AGC_LOCK : { ret =lgdt3306a_read_reg (state,0x0080 , &val); +if (ret) +return ret;if ((val &0x40 ) ==0x40 ) lockStatus =LG3306_LOCK ;
@@ -1142,6 +1178,8 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_s modeOper =lgdt3306a_check_oper_mode (state);if ((modeOper ==LG3306_QAM64 ) || (modeOper ==LG3306_QAM256 )) { ret =lgdt3306a_read_reg (state,0x1094 , &val); +if (ret) +return ret;if ((val &0x80 ) ==0x80 ) lockStatus =LG3306_LOCK ;
@@ -1158,6 +1196,8 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_s modeOper =lgdt3306a_check_oper_mode (state);if ((modeOper ==LG3306_QAM64 ) || (modeOper ==LG3306_QAM256 )) { ret =lgdt3306a_read_reg (state,0x0080 , &val); +if (ret) +return ret;if ((val &0x10 ) ==0x10 ) lockStatus =LG3306_LOCK ;
@@ -1186,6 +1226,8 @@ static enum lgdt3306a_neverlock_status lgdt3306a_check_neverlock_status(struct lenum lgdt3306a_neverlock_status lockStatus; ret =lgdt3306a_read_reg (state,0x0080 , &val); +if (ret) +return ret; lockStatus = (enum lgdt3306a_neverlock_status )(val &0x03 );lg_dbg ("NeverLock=%d" , lockStatus);
@@ -1193,7 +1235,7 @@ static enum lgdt3306a_neverlock_status lgdt3306a_check_neverlock_status(struct lreturn lockStatus; } -static void lgdt3306a_pre_monitoring (struct lgdt3306a_state *state) +static int lgdt3306a_pre_monitoring (struct lgdt3306a_state *state) {u8 val =0 ;int ret;
@@ -1201,16 +1243,24 @@ static void lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)/* Channel variation */ ret =lgdt3306a_read_reg (state,0x21bc , &currChDiffACQ); +if (ret) +return ret;/* SNR of Frame sync */ ret =lgdt3306a_read_reg (state,0x21a1 , &val); +if (ret) +return ret; snrRef = val &0x3f ;/* Strong Main CIR */ ret =lgdt3306a_read_reg (state,0x2199 , &val); +if (ret) +return ret; mainStrong = (val &0x40 ) >>6 ; ret =lgdt3306a_read_reg (state,0x0090 , &val); +if (ret) +return ret; aiccrejStatus = (val &0xf0 ) >>4 ; lg_dbg("snrRef=%d mainStrong=%d aiccrejStatus=%d currChDiffACQ=0x%x\n",
@@ -1221,30 +1271,50 @@ static void lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)#endif if (mainStrong ==0 ) { ret =lgdt3306a_read_reg (state,0x2135 , &val); +if (ret) +return ret; val &=0x0f ; val |=0xa0 ; ret =lgdt3306a_write_reg (state,0x2135 , val); +if (ret) +return ret; ret =lgdt3306a_read_reg (state,0x2141 , &val); +if (ret) +return ret; val &=0x3f ; val |=0x80 ; ret =lgdt3306a_write_reg (state,0x2141 , val); +if (ret) +return ret; ret =lgdt3306a_write_reg (state,0x2122 ,0x70 ); +if (ret) +return ret; }else {/* Weak ghost or static channel */ ret =lgdt3306a_read_reg (state,0x2135 , &val); +if (ret) +return ret; val &=0x0f ; val |=0x70 ; ret =lgdt3306a_write_reg (state,0x2135 , val); +if (ret) +return ret; ret =lgdt3306a_read_reg (state,0x2141 , &val); +if (ret) +return ret; val &=0x3f ; val |=0x40 ; ret =lgdt3306a_write_reg (state,0x2141 , val); +if (ret) +return ret; ret =lgdt3306a_write_reg (state,0x2122 ,0x40 ); +if (ret) +return ret; } - +return 0 ; }static enum lgdt3306a_lock_status lgdt3306a_sync_lock_poll (struct lgdt3306a_state *state)
@@ -1310,6 +1380,8 @@ static u8 lgdt3306a_get_packet_error(struct lgdt3306a_state *state)int ret; ret =lgdt3306a_read_reg (state,0x00fa , &val); +if (ret) +return ret;return val; }
@@ -1393,7 +1465,9 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_statereturn LG3306_UNLOCK ; }else {msleep (20 ); -lgdt3306a_pre_monitoring (state); + ret =lgdt3306a_pre_monitoring (state); +if (ret) +return LG3306_UNLOCK ; packet_error =lgdt3306a_get_packet_error (state); snr =lgdt3306a_calculate_snr_x100 (state);
@@ -1483,7 +1557,7 @@ static int lgdt3306a_read_status(struct dvb_frontend *fe, fe_status_t *status) *status |=FE_HAS_LOCK ; -lgdt3306a_monitor_vsb (state); + ret =lgdt3306a_monitor_vsb (state); }break ;default :
Signature · 1 line
1.9.3
PATCH 6/13 lgdt3306a: Remove FSF address
In reply to Mauro Carvalho ChehabFix this CodingStyle error:
ERROR: Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so ag$ #56: FILE: drivers/media/dvb-frontends/lgdt3306a.c:19:
+ * along with this program; if not, write to the Free Software$
drivers/media/dvb-frontends/lgdt3306a.c +1 -5
@@ -14,11 +14,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* */ #include <asm/div64.h>
@@ -1455,6 +1450,7 @@ static u32 lgdt3306a_calculate_snr_x100(struct lgdt3306a_state *state)static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll (struct lgdt3306a_state *state) { +int ret;u8 cnt =0 ;u8 packet_error;u32 snr;
drivers/media/dvb-frontends/lgdt3306a.h +0 -5
@@ -13,11 +13,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* */ #ifndef _LGDT3306A_H_
Signature · 1 line
1.9.3
PATCH 7/13 lbdt3306a: rework at printk macros
In reply to Mauro Carvalho ChehabUse pr_foo() where there's a direct replacement. For debug, use custom-made macros, for now, as there are 3 different debug levels.
We should get rid of those some day, specially since several such macros can be just removed, as Kernel trace would provide about the same output.
This gets rid of some checkpatch errors:
WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
+#define lg_info(fmt, arg...) printk(KERN_INFO "lgdt3306a: " fmt, ##arg)
ERROR: Macros with complex values should be enclosed in parentheses
+#define lg_dbg(fmt, arg...) if (debug & DBG_INFO) \
+ lg_printk(KERN_DEBUG, fmt, ##arg)
ERROR: Macros with complex values should be enclosed in parentheses
+#define lg_reg(fmt, arg...) if (debug & DBG_REG) \
+ lg_printk(KERN_DEBUG, fmt, ##arg)
drivers/media/dvb-frontends/lgdt3306a.c +89 -83
@@ -16,6 +16,8 @@* GNU General Public License for more details. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <asm/div64.h> #include <linux/dvb/frontend.h> #include "dvb_math.h"
@@ -30,23 +32,27 @@ MODULE_PARM_DESC(debug, "set debug level (info=1, reg=2 (or-able))");#define DBG_REG 2#define DBG_DUMP 4/* FGR - comment out to remove dump code */ -#define lg_printk(kern, fmt, arg...) \ - printk(kern "%s(): " fmt, __func__, ##arg) +#define lg_debug(fmt, arg...) \ + printk(KERN_DEBUG pr_fmt(fmt), ## arg) -#define lg_info(fmt, arg...) printk(KERN_INFO "lgdt3306a: " fmt, ##arg) -#define lg_warn(fmt, arg...) lg_printk(KERN_WARNING, fmt, ##arg) -#define lg_err(fmt, arg...) lg_printk(KERN_ERR, fmt, ##arg) -#define lg_dbg(fmt, arg...) if (debug & DBG_INFO) \ - lg_printk(KERN_DEBUG, fmt, ##arg) -#define lg_reg(fmt, arg...) if (debug & DBG_REG) \ - lg_printk(KERN_DEBUG, fmt, ##arg) +#define dbg_info(fmt, arg...) \ + do { \ + if (debug & DBG_INFO) \ + lg_debug(fmt, ## arg); \ + } while (0) + +#define dbg_reg(fmt, arg...) \ + do { \ + if (debug & DBG_REG) \ + lg_debug(fmt, ## arg); \ + } while (0)#define lg_chkerr (ret) \ ({ \ int __ret; \ __ret = (ret < 0); \ if (__ret) \ - lg_err("error %d on line %d\n", ret, __LINE__); \ + pr_err("error %d on line %d\n", ret, __LINE__); \ __ret; \ })
@@ -116,12 +122,12 @@ static int lgdt3306a_write_reg(struct lgdt3306a_state *state, u16 reg, u8 val) .buf = buf, .len = 3, }; -lg_reg ("reg: 0x%04x, val: 0x%02x\n" , reg, val); +dbg_reg ("reg: 0x%04x, val: 0x%02x\n" , reg, val); ret =i2c_transfer (state->i2c_adap, &msg,1 );if (ret !=1 ) { -lg_err ("error (addr %02x %02x <- %02x, err = %i)\n" , +pr_err ("error (addr %02x %02x <- %02x, err = %i)\n" , msg.buf[0 ], msg.buf[1 ], msg.buf[2 ], ret);if (ret <0 )return ret;
@@ -145,14 +151,14 @@ static int lgdt3306a_read_reg(struct lgdt3306a_state *state, u16 reg, u8 *val) ret =i2c_transfer (state->i2c_adap, msg,2 );if (ret !=2 ) { -lg_err ("error (addr %02x reg %04x error (ret == %i)\n" , +pr_err ("error (addr %02x reg %04x error (ret == %i)\n" , state->cfg->i2c_addr, reg, ret);if (ret <0 )return ret;else return -EREMOTEIO ; } -lg_reg ("reg: 0x%04x, val: 0x%02x\n" , reg, *val); +dbg_reg ("reg: 0x%04x, val: 0x%02x\n" , reg, *val);return 0 ; }
@@ -172,7 +178,7 @@ static int lgdt3306a_set_reg_bit(struct lgdt3306a_state *state,u8 val;int ret; -lg_reg ("reg: 0x%04x, bit: %d, level: %d\n" , reg, bit, onoff); +dbg_reg ("reg: 0x%04x, bit: %d, level: %d\n" , reg, bit, onoff); ret =lgdt3306a_read_reg (state, reg, &val);if (lg_chkerr (ret))
@@ -193,7 +199,7 @@ static int lgdt3306a_soft_reset(struct lgdt3306a_state *state) {int ret; -lg_dbg ("\n" ); +dbg_info ("\n" ); ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,0 );if (lg_chkerr (ret))
@@ -213,7 +219,7 @@ static int lgdt3306a_mpeg_mode(struct lgdt3306a_state *state,u8 val;int ret; -lg_dbg ("(%d)\n" , mode); +dbg_info ("(%d)\n" , mode);/* transport packet format */ ret =lgdt3306a_set_reg_bit (state,0x0071 ,7 , mode ==LGDT3306A_MPEG_PARALLEL ?1 :0 );/* TPSENB=0x80 */ if (lg_chkerr (ret))
@@ -247,7 +253,7 @@ static int lgdt3306a_mpeg_mode_polarity(struct lgdt3306a_state *state,u8 val;int ret; -lg_dbg ("edge=%d, valid=%d\n" , edge, valid); +dbg_info ("edge=%d, valid=%d\n" , edge, valid); ret =lgdt3306a_read_reg (state,0x0070 , &val);if (lg_chkerr (ret))
@@ -273,7 +279,7 @@ static int lgdt3306a_mpeg_tristate(struct lgdt3306a_state *state,u8 val;int ret; -lg_dbg ("(%d)\n" , mode); +dbg_info ("(%d)\n" , mode);if (mode) { ret =lgdt3306a_read_reg (state,0x0070 , &val);
@@ -311,7 +317,7 @@ static int lgdt3306a_ts_bus_ctrl(struct dvb_frontend *fe, int acquire) {struct lgdt3306a_state *state = fe->demodulator_priv; -lg_dbg ("acquire=%d\n" , acquire); +dbg_info ("acquire=%d\n" , acquire);return lgdt3306a_mpeg_tristate (state, acquire ?0 :1 );
@@ -322,7 +328,7 @@ static int lgdt3306a_power(struct lgdt3306a_state *state, {int ret; -lg_dbg ("(%d)\n" , mode); +dbg_info ("(%d)\n" , mode);if (mode ==0 ) { ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,0 );/* into reset */
@@ -356,7 +362,7 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state)u8 val;int ret; -lg_dbg ("\n" ); +dbg_info ("\n" );/* 0. Spectrum inversion detection manual; spectrum inverted */ ret =lgdt3306a_read_reg (state,0x0002 , &val);
@@ -506,7 +512,7 @@ static int lgdt3306a_set_vsb(struct lgdt3306a_state *state)if (lg_chkerr (ret)) goto fail; -lg_dbg ("complete\n" ); +dbg_info ("complete\n" ); fail:return ret; }
@@ -516,7 +522,7 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation)u8 val;int ret; -lg_dbg ("modulation=%d\n" , modulation); +dbg_info ("modulation=%d\n" , modulation);/* 1. Selection of standard mode(0x08=QAM, 0x80=VSB) */ ret =lgdt3306a_write_reg (state,0x0008 ,0x08 );
@@ -578,7 +584,7 @@ static int lgdt3306a_set_qam(struct lgdt3306a_state *state, int modulation)if (lg_chkerr (ret)) goto fail; -lg_dbg ("complete\n" ); +dbg_info ("complete\n" ); fail:return ret; }
@@ -588,7 +594,7 @@ static int lgdt3306a_set_modulation(struct lgdt3306a_state *state, {int ret; -lg_dbg ("\n" ); +dbg_info ("\n" );switch (p->modulation) {case VSB_8 :
@@ -618,7 +624,7 @@ static int lgdt3306a_agc_setup(struct lgdt3306a_state *state, struct dtv_frontend_properties *p) {/* TODO: anything we want to do here??? */ -lg_dbg ("\n" ); +dbg_info ("\n" );switch (p->modulation) {case VSB_8 :
@@ -639,7 +645,7 @@ static int lgdt3306a_set_inversion(struct lgdt3306a_state *state, {int ret; -lg_dbg ("(%d)\n" , inversion); +dbg_info ("(%d)\n" , inversion); ret =lgdt3306a_set_reg_bit (state,0x0002 ,2 , inversion ?1 :0 );return ret;
@@ -650,7 +656,7 @@ static int lgdt3306a_set_inversion_auto(struct lgdt3306a_state *state, {int ret; -lg_dbg ("(%d)\n" , enabled); +dbg_info ("(%d)\n" , enabled);/* 0=Manual 1=Auto(QAM only) */ ret =lgdt3306a_set_reg_bit (state,0x0002 ,3 , enabled);/* SPECINVAUTO=0x04 */
@@ -663,7 +669,7 @@ static int lgdt3306a_spectral_inversion(struct lgdt3306a_state *state, {int ret =0 ; -lg_dbg ("(%d)\n" , inversion); +dbg_info ("(%d)\n" , inversion);#if 0 /* FGR - spectral_inversion defaults already set for VSB and QAM; can enable later if desired */
@@ -705,7 +711,7 @@ static int lgdt3306a_set_if(struct lgdt3306a_state *state,switch (if_freq_khz) {default : -lg_warn ("IF=%d KHz is not supportted, 3250 assumed\n" , if_freq_khz); +pr_warn ("IF=%d KHz is not supportted, 3250 assumed\n" , if_freq_khz);/* fallthrough */ case 3250 :/* 3.25Mhz */ nco1 =0x34 ;
@@ -735,7 +741,7 @@ static int lgdt3306a_set_if(struct lgdt3306a_state *state,if (ret)return ret; -lg_dbg ("if_freq=%d KHz->[%04x]\n" , if_freq_khz, nco1<<8 | nco2); +dbg_info ("if_freq=%d KHz->[%04x]\n" , if_freq_khz, nco1<<8 | nco2);return 0 ; }
@@ -747,10 +753,10 @@ static int lgdt3306a_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)struct lgdt3306a_state *state = fe->demodulator_priv;if (state->cfg->deny_i2c_rptr) { -lg_dbg ("deny_i2c_rptr=%d\n" , state->cfg->deny_i2c_rptr); +dbg_info ("deny_i2c_rptr=%d\n" , state->cfg->deny_i2c_rptr);return 0 ; } -lg_dbg ("(%d)\n" , enable); +dbg_info ("(%d)\n" , enable);return lgdt3306a_set_reg_bit (state,0x0002 ,7 , enable ?0 :1 );/* NI2CRPTEN=0x80 */ }
@@ -759,7 +765,7 @@ static int lgdt3306a_sleep(struct lgdt3306a_state *state) {int ret; -lg_dbg ("\n" ); +dbg_info ("\n" ); state->current_frequency =-1 ;/* force re-tune, when we wake */ ret =lgdt3306a_mpeg_tristate (state,1 );/* disable data bus */
@@ -786,7 +792,7 @@ static int lgdt3306a_init(struct dvb_frontend *fe)u8 val;int ret; -lg_dbg ("\n" ); +dbg_info ("\n" );/* 1. Normal operation mode */ ret =lgdt3306a_set_reg_bit (state,0x0001 ,0 ,1 );/* SIMFASTENB=0x01 */
@@ -871,7 +877,7 @@ static int lgdt3306a_init(struct dvb_frontend *fe)if (lg_chkerr (ret)) goto fail; }else { -lg_err ("Bad xtalMHz=%d\n" , state->cfg->xtalMHz); +pr_err ("Bad xtalMHz=%d\n" , state->cfg->xtalMHz); }#if 0 ret =lgdt3306a_write_reg (state,0x000e ,0x00 );
@@ -936,11 +942,11 @@ static int lgdt3306a_set_parameters(struct dvb_frontend *fe)struct lgdt3306a_state *state = fe->demodulator_priv;int ret; -lg_dbg ("(%d, %d)\n" , p->frequency, p->modulation); +dbg_info ("(%d, %d)\n" , p->frequency, p->modulation);if (state->current_frequency == p->frequency && state->current_modulation == p->modulation) { -lg_dbg (" (already set, skipping ...)\n" ); +dbg_info (" (already set, skipping ...)\n" );return 0 ; } state->current_frequency =-1 ;
@@ -1009,7 +1015,7 @@ static int lgdt3306a_get_frontend(struct dvb_frontend *fe)struct lgdt3306a_state *state = fe->demodulator_priv;struct dtv_frontend_properties *p = &fe->dtv_property_cache; -lg_dbg ("(%u, %d)\n" , state->current_frequency, state->current_modulation); +dbg_info ("(%u, %d)\n" , state->current_frequency, state->current_modulation); p->modulation = state->current_modulation; p->frequency = state->current_frequency;
@@ -1057,7 +1063,7 @@ static int lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)return ret; fbDlyCir |= val; -lg_dbg ("snrRef=%d maxPowerMan=0x%x nCombDet=%d fbDlyCir=0x%x\n" , +dbg_info ("snrRef=%d maxPowerMan=0x%x nCombDet=%d fbDlyCir=0x%x\n" , snrRef, maxPowerMan, nCombDet, fbDlyCir);/* Carrier offset sub loop bandwidth */
@@ -1108,7 +1114,7 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_stat goto err;if (val &0x80 ) { -lg_dbg ("VSB\n" ); +dbg_info ("VSB\n" );return LG3306_VSB ; }if (val &0x08 ) {
@@ -1117,15 +1123,15 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_stat goto err; val = val >>2 ;if (val &0x01 ) { -lg_dbg ("QAM256\n" ); +dbg_info ("QAM256\n" );return LG3306_QAM256 ; }else { -lg_dbg ("QAM64\n" ); +dbg_info ("QAM64\n" );return LG3306_QAM64 ; } } err: -lg_warn ("UNKNOWN\n" ); +pr_warn ("UNKNOWN\n" );return LG3306_UNKNOWN_MODE ; }
@@ -1151,7 +1157,7 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_selse lockStatus =LG3306_UNLOCK ; -lg_dbg ("SYNC_LOCK=%x\n" , lockStatus); +dbg_info ("SYNC_LOCK=%x\n" , lockStatus);break ; }case LG3306_AGC_LOCK :
@@ -1165,7 +1171,7 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_selse lockStatus =LG3306_UNLOCK ; -lg_dbg ("AGC_LOCK=%x\n" , lockStatus); +dbg_info ("AGC_LOCK=%x\n" , lockStatus);break ; }case LG3306_TR_LOCK :
@@ -1183,7 +1189,7 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_s }else lockStatus =LG3306_UNKNOWN_LOCK ; -lg_dbg ("TR_LOCK=%x\n" , lockStatus); +dbg_info ("TR_LOCK=%x\n" , lockStatus);break ; }case LG3306_FEC_LOCK :
@@ -1201,13 +1207,13 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_s }else lockStatus =LG3306_UNKNOWN_LOCK ; -lg_dbg ("FEC_LOCK=%x\n" , lockStatus); +dbg_info ("FEC_LOCK=%x\n" , lockStatus);break ; }default : lockStatus =LG3306_UNKNOWN_LOCK ; -lg_warn ("UNKNOWN whatLock=%d\n" , whatLock); +pr_warn ("UNKNOWN whatLock=%d\n" , whatLock);break ; }
@@ -1225,7 +1231,7 @@ static enum lgdt3306a_neverlock_status lgdt3306a_check_neverlock_status(struct lreturn ret; lockStatus = (enum lgdt3306a_neverlock_status )(val &0x03 ); -lg_dbg ("NeverLock=%d" , lockStatus); +dbg_info ("NeverLock=%d" , lockStatus);return lockStatus; }
@@ -1258,7 +1264,7 @@ static int lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)return ret; aiccrejStatus = (val &0xf0 ) >>4 ; -lg_dbg ("snrRef=%d mainStrong=%d aiccrejStatus=%d currChDiffACQ=0x%x\n" , +dbg_info ("snrRef=%d mainStrong=%d aiccrejStatus=%d currChDiffACQ=0x%x\n" , snrRef, mainStrong, aiccrejStatus, currChDiffACQ);#if 0
@@ -1323,11 +1329,11 @@ static enum lgdt3306a_lock_status lgdt3306a_sync_lock_poll(struct lgdt3306a_stat syncLockStatus =lgdt3306a_check_lock_status (state,LG3306_SYNC_LOCK );if (syncLockStatus ==LG3306_LOCK ) { -lg_dbg ("locked(%d)\n" , i); +dbg_info ("locked(%d)\n" , i);return LG3306_LOCK ; } } -lg_dbg ("not locked\n" ); +dbg_info ("not locked\n" );return LG3306_UNLOCK ; }
@@ -1342,11 +1348,11 @@ static enum lgdt3306a_lock_status lgdt3306a_fec_lock_poll(struct lgdt3306a_state FECLockStatus =lgdt3306a_check_lock_status (state,LG3306_FEC_LOCK );if (FECLockStatus ==LG3306_LOCK ) { -lg_dbg ("locked(%d)\n" , i); +dbg_info ("locked(%d)\n" , i);return FECLockStatus; } } -lg_dbg ("not locked\n" ); +dbg_info ("not locked\n" );return FECLockStatus; }
@@ -1361,11 +1367,11 @@ static enum lgdt3306a_neverlock_status lgdt3306a_neverlock_poll(struct lgdt3306a NLLockStatus =lgdt3306a_check_neverlock_status (state);if (NLLockStatus ==LG3306_NL_LOCK ) { -lg_dbg ("NL_LOCK(%d)\n" , i); +dbg_info ("NL_LOCK(%d)\n" , i);return NLLockStatus; } } -lg_dbg ("NLLockStatus=%d\n" , NLLockStatus); +dbg_info ("NLLockStatus=%d\n" , NLLockStatus);return NLLockStatus; }
@@ -1443,7 +1449,7 @@ static u32 lgdt3306a_calculate_snr_x100(struct lgdt3306a_state *state)return 0 ; snr_x100 =log10_x1000 ((pwr *10000 ) / mse) -3000 ; -lg_dbg ("mse=%u, pwr=%u, snr_x100=%d\n" , mse, pwr, snr_x100); +dbg_info ("mse=%u, pwr=%u, snr_x100=%d\n" , mse, pwr, snr_x100);return snr_x100; }
@@ -1457,7 +1463,7 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_statewhile (1 ) {if (lgdt3306a_sync_lock_poll (state) ==LG3306_UNLOCK ) { -lg_dbg ("no sync lock!\n" ); +dbg_info ("no sync lock!\n" );return LG3306_UNLOCK ; }else {msleep (20 );
@@ -1467,7 +1473,7 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_state packet_error =lgdt3306a_get_packet_error (state); snr =lgdt3306a_calculate_snr_x100 (state); -lg_dbg ("cnt=%d errors=%d snr=%d\n" , +dbg_info ("cnt=%d errors=%d snr=%d\n" , cnt, packet_error, snr);if ((snr <1500 ) || (packet_error >=0xff ))
@@ -1476,7 +1482,7 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_statereturn LG3306_LOCK ;if (cnt >=10 ) { -lg_dbg ("not locked!\n" ); +dbg_info ("not locked!\n" );return LG3306_UNLOCK ; } }
@@ -1492,14 +1498,14 @@ static enum lgdt3306a_lock_status lgdt3306a_qam_lock_poll(struct lgdt3306a_statewhile (1 ) {if (lgdt3306a_fec_lock_poll (state) ==LG3306_UNLOCK ) { -lg_dbg ("no fec lock!\n" ); +dbg_info ("no fec lock!\n" );return LG3306_UNLOCK ; }else {msleep (20 ); packet_error =lgdt3306a_get_packet_error (state); snr =lgdt3306a_calculate_snr_x100 (state); -lg_dbg ("cnt=%d errors=%d snr=%d\n" , +dbg_info ("cnt=%d errors=%d snr=%d\n" , cnt, packet_error, snr);if ((snr <1500 ) || (packet_error >=0xff ))
@@ -1508,7 +1514,7 @@ static enum lgdt3306a_lock_status lgdt3306a_qam_lock_poll(struct lgdt3306a_statereturn LG3306_LOCK ;if (cnt >=10 ) { -lg_dbg ("not locked!\n" ); +dbg_info ("not locked!\n" );return LG3306_UNLOCK ; } }
@@ -1525,9 +1531,9 @@ static int lgdt3306a_read_status(struct dvb_frontend *fe, fe_status_t *status)if (fe->ops.tuner_ops.get_rf_strength) { ret = fe->ops.tuner_ops.get_rf_strength (fe, &strength);if (ret ==0 ) { -lg_dbg ("strength=%d\n" , strength); +dbg_info ("strength=%d\n" , strength); }else { -lg_dbg ("fe->ops.tuner_ops.get_rf_strength() failed\n" ); +dbg_info ("fe->ops.tuner_ops.get_rf_strength() failed\n" ); } }
@@ -1620,7 +1626,7 @@ static int lgdt3306a_read_signal_strength(struct dvb_frontend *fe, str = (0xffff * str) /100 ; } *strength = (u16 )str; -lg_dbg ("strength=%u\n" , *strength); +dbg_info ("strength=%u\n" , *strength); fail:return ret;
@@ -1642,7 +1648,7 @@ static int lgdt3306a_read_ber(struct dvb_frontend *fe, u32 *ber) tmp = (tmp <<8 ) |read_reg (state,0x00fe );/* NBERVALUE[8-15] */ tmp = (tmp <<8 ) |read_reg (state,0x00ff );/* NBERVALUE[0-7] */ *ber = tmp; -lg_dbg ("ber=%u\n" , tmp); +dbg_info ("ber=%u\n" , tmp);#endif return 0 ; }
@@ -1656,7 +1662,7 @@ static int lgdt3306a_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)/* FGR - BUGBUG - I don't know what value is expected by dvb_core * what happens when value wraps? */ *ucblocks =read_reg (state,0x00f4 );/* TPIFTPERRCNT[0-7] */ -lg_dbg ("ucblocks=%u\n" , *ucblocks); +dbg_info ("ucblocks=%u\n" , *ucblocks);#endif return 0 ;
@@ -1667,7 +1673,7 @@ static int lgdt3306a_tune(struct dvb_frontend *fe, bool re_tune, unsigned int moint ret =0 ;struct lgdt3306a_state *state = fe->demodulator_priv; -lg_dbg ("re_tune=%u\n" , re_tune); +dbg_info ("re_tune=%u\n" , re_tune);if (re_tune) { state->current_frequency =-1 ;/* force re-tune */
@@ -1686,7 +1692,7 @@ static int lgdt3306a_get_tune_settings(struct dvb_frontend *fe, *fe_tune_settings) { fe_tune_settings->min_delay_ms =100 ; -lg_dbg ("\n" ); +dbg_info ("\n" );return 0 ; }
@@ -1702,7 +1708,7 @@ static int lgdt3306a_search(struct dvb_frontend *fe)/* wait frontend lock */ for (i =20 ; i >0 ; i--) { -lg_dbg (": loop=%d\n" , i); +dbg_info (": loop=%d\n" , i);msleep (50 ); ret =lgdt3306a_read_status (fe, &status);if (ret)
@@ -1719,7 +1725,7 @@ static int lgdt3306a_search(struct dvb_frontend *fe)return DVBFE_ALGO_SEARCH_AGAIN ; error: -lg_dbg ("failed (%d)\n" , ret); +dbg_info ("failed (%d)\n" , ret);return DVBFE_ALGO_SEARCH_ERROR ; }
@@ -1727,7 +1733,7 @@ static void lgdt3306a_release(struct dvb_frontend *fe) {struct lgdt3306a_state *state = fe->demodulator_priv; -lg_dbg ("\n" ); +dbg_info ("\n" );kfree (state); }
@@ -1740,7 +1746,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,int ret;u8 val; -lg_dbg ("(%d-%04x)\n" , +dbg_info ("(%d-%04x)\n" , i2c_adap ?i2c_adapter_id (i2c_adap) :0 , config ? config->i2c_addr :0 );
@@ -1762,7 +1768,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if (lg_chkerr (ret)) goto fail;if ((val &0x74 ) !=0x74 ) { -lg_warn ("expected 0x74, got 0x%x\n" , (val &0x74 )); +pr_warn ("expected 0x74, got 0x%x\n" , (val &0x74 ));#if 0 goto fail;/* BUGBUG - re-enable when we know this is right */ #endif
@@ -1771,7 +1777,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if (lg_chkerr (ret)) goto fail;if ((val &0xf6 ) !=0xc6 ) { -lg_warn ("expected 0xc6, got 0x%x\n" , (val &0xf6 )); +pr_warn ("expected 0xc6, got 0x%x\n" , (val &0xf6 ));#if 0 goto fail;/* BUGBUG - re-enable when we know this is right */ #endif
@@ -1780,7 +1786,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if (lg_chkerr (ret)) goto fail;if ((val &0x73 ) !=0x03 ) { -lg_warn ("expected 0x03, got 0x%x\n" , (val &0x73 )); +pr_warn ("expected 0x03, got 0x%x\n" , (val &0x73 ));#if 0 goto fail;/* BUGBUG - re-enable when we know this is right */ #endif
@@ -1794,7 +1800,7 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,return &state->frontend; fail: -lg_warn ("unable to detect LGDT3306A hardware\n" ); +pr_warn ("unable to detect LGDT3306A hardware\n" );kfree (state);return NULL ; }
@@ -2049,13 +2055,13 @@ static void lgdt3306a_DumpRegs(struct lgdt3306a_state *state)return ; debug &= ~DBG_REG ;/* suppress DBG_REG during reg dump */ -lg_info ("\n" ); +lg_debug ("\n" );for (i =0 ; i < numDumpRegs; i++) {lgdt3306a_read_reg (state, regtab[i], ®val1[i]);if (regval1[i] != regval2[i]) { -lg_info (" %04X = %02X\n" , regtab[i], regval1[i]); - regval2[i] = regval1[i]; +lg_debug (" %04X = %02X\n" , regtab[i], regval1[i]); + regval2[i] = regval1[i]; } } debug = sav_debug;
Signature · 1 line
1.9.3
PATCH 8/13 lbdt3306a: simplify the lock status check
In reply to Mauro Carvalho ChehabThe logic there is too complex and it looks like an inifite loop.
So, simplify the logic and implement it as a for loop.
This gets rid of the following checkpatch.pl warnings:
WARNING: else is not generally useful after a break or return
+ return LG3306_UNLOCK;
+ } else {
WARNING: else is not generally useful after a break or return
+ return LG3306_UNLOCK;
+ } else {
drivers/media/dvb-frontends/lgdt3306a.c +28 -40
@@ -1461,64 +1461,52 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_stateu8 packet_error;u32 snr; -while (1 ) { +for (cnt =0 ; cnt <10 ; cnt++) {if (lgdt3306a_sync_lock_poll (state) ==LG3306_UNLOCK ) {dbg_info ("no sync lock!\n" );return LG3306_UNLOCK ; - }else { -msleep (20 ); - ret =lgdt3306a_pre_monitoring (state); -if (ret) -return LG3306_UNLOCK ; - - packet_error =lgdt3306a_get_packet_error (state); - snr =lgdt3306a_calculate_snr_x100 (state); -dbg_info ("cnt=%d errors=%d snr=%d\n" , - cnt, packet_error, snr); - -if ((snr <1500 ) || (packet_error >=0xff )) - cnt++; -else -return LG3306_LOCK ; - -if (cnt >=10 ) { -dbg_info ("not locked!\n" ); -return LG3306_UNLOCK ; - } } + +msleep (20 ); + ret =lgdt3306a_pre_monitoring (state); +if (ret) +break ; + + packet_error =lgdt3306a_get_packet_error (state); + snr =lgdt3306a_calculate_snr_x100 (state); +dbg_info ("cnt=%d errors=%d snr=%d\n" , cnt, packet_error, snr); + +if ((snr >=1500 ) && (packet_error <0xff )) +return LG3306_LOCK ; } + +dbg_info ("not locked!\n" );return LG3306_UNLOCK ; }static enum lgdt3306a_lock_status lgdt3306a_qam_lock_poll (struct lgdt3306a_state *state) { -u8 cnt =0 ; +u8 cnt;u8 packet_error;u32 snr; -while (1 ) { +for (cnt =0 ; cnt <10 ; cnt++) {if (lgdt3306a_fec_lock_poll (state) ==LG3306_UNLOCK ) {dbg_info ("no fec lock!\n" );return LG3306_UNLOCK ; - }else { -msleep (20 ); - - packet_error =lgdt3306a_get_packet_error (state); - snr =lgdt3306a_calculate_snr_x100 (state); -dbg_info ("cnt=%d errors=%d snr=%d\n" , - cnt, packet_error, snr); - -if ((snr <1500 ) || (packet_error >=0xff )) - cnt++; -else -return LG3306_LOCK ; - -if (cnt >=10 ) { -dbg_info ("not locked!\n" ); -return LG3306_UNLOCK ; - } } + +msleep (20 ); + + packet_error =lgdt3306a_get_packet_error (state); + snr =lgdt3306a_calculate_snr_x100 (state); +dbg_info ("cnt=%d errors=%d snr=%d\n" , cnt, packet_error, snr); + +if ((snr >=1500 ) && (packet_error <0xff )) +return LG3306_LOCK ; } + +dbg_info ("not locked!\n" );return LG3306_UNLOCK ; }
Signature · 1 line
1.9.3
PATCH 9/13 lgdt3306a: Don't use else were not needed
In reply to Mauro Carvalho ChehabGet rid of the remaining checkpatch.pl warnings:
WARNING: braces {} are not necessary for any arm of this statement
drivers/media/dvb-frontends/lgdt3306a.c +6 -6
@@ -1125,10 +1125,9 @@ static enum lgdt3306a_modulation lgdt3306a_check_oper_mode(struct lgdt3306a_statif (val &0x01 ) {dbg_info ("QAM256\n" );return LG3306_QAM256 ; - }else { -dbg_info ("QAM64\n" ); -return LG3306_QAM64 ; } +dbg_info ("QAM64\n" ); +return LG3306_QAM64 ; } err:pr_warn ("UNKNOWN\n" );
@@ -1399,14 +1398,15 @@ static u32 log10_x1000(u32 x)if (x <=0 )return -1000000 ;/* signal error */ +if (x ==10 ) +return 0 ;/* log(1)=0 */ +if (x <10 ) {while (x <10 ) { x = x *10 ; log_val--; } - }else if (x ==10 ) { -return 0 ;/* log(1)=0 */ - }else { + }else {/* x > 10 */ while (x >=100 ) { x = x /10 ; log_val++;
Signature · 1 line
1.9.3
PATCH 10/13 lbdt3306a: remove uneeded braces
In reply to Mauro Carvalho ChehabWARNING: braces {} are not necessary for any arm of this statement
+ if (ret == 0) {
[...]
+ } else {
[...]
drivers/media/dvb-frontends/lgdt3306a.c +2 -3
@@ -1518,11 +1518,10 @@ static int lgdt3306a_read_status(struct dvb_frontend *fe, fe_status_t *status)if (fe->ops.tuner_ops.get_rf_strength) { ret = fe->ops.tuner_ops.get_rf_strength (fe, &strength); -if (ret ==0 ) { +if (ret ==0 )dbg_info ("strength=%d\n" , strength); - }else { +else dbg_info ("fe->ops.tuner_ops.get_rf_strength() failed\n" ); - } } *status =0 ;
Signature · 1 line
1.9.3
PATCH 11/13 lgdt3306a: constify log tables
In reply to Mauro Carvalho ChehabIdeally, we should be replacing this function by intlog10().
While we don't do that, let's at least constify the tables, in order to remove its code footfrint, and get rid of nelems.
This also fixes a few 80-cols CodingStyle warnings.
drivers/media/dvb-frontends/lgdt3306a.c +9 -5
@@ -1386,11 +1386,15 @@ static u8 lgdt3306a_get_packet_error(struct lgdt3306a_state *state)return val; } +static const u32 valx_x10[] = { +10 ,11 ,13 ,15 ,17 ,20 ,25 ,33 ,41 ,50 ,59 ,73 ,87 ,100 +}; +static const u32 log10x_x1000[] = { +0 ,41 ,114 ,176 ,230 ,301 ,398 ,518 ,613 ,699 ,771 ,863 ,939 ,1000 +}; +static u32 log10_x1000 (u32 x) { -static u32 valx_x10[] = {10 ,11 ,13 ,15 ,17 ,20 ,25 ,33 ,41 ,50 ,59 ,73 ,87 ,100 }; -static u32 log10x_x1000[] = {0 ,41 ,114 ,176 ,230 ,301 ,398 ,518 ,613 ,699 ,771 ,863 ,939 ,1000 }; -static u32 nelems =sizeof (valx_x10)/sizeof (valx_x10[0 ]);u32 diff_val, step_val, step_log10;u32 log_val =0 ;u32 i;
@@ -1418,11 +1422,11 @@ static u32 log10_x1000(u32 x)return log_val;/* don't need to interpolate */ /* find our place on the log curve */ -for (i =1 ; i < nelems; i++) { +for (i =1 ; i <ARRAY_SIZE (valx_x10); i++) {if (valx_x10[i] >= x)break ; } -if (i == nelems) +if (i ==ARRAY_SIZE (valx_x10))return log_val + log10x_x1000[i -1 ]; diff_val = x - valx_x10[i-1 ];
Signature · 1 line
1.9.3
PATCH 12/13 lgdt3306a: Break long lines
In reply to Mauro Carvalho ChehabFix most of checkpatch warnings like:
WARNING: line over 80 characters
drivers/media/dvb-frontends/lgdt3306a.c +91 -43
@@ -220,13 +220,17 @@ static int lgdt3306a_mpeg_mode(struct lgdt3306a_state *state,int ret;dbg_info ("(%d)\n" , mode); -/* transport packet format */ - ret =lgdt3306a_set_reg_bit (state,0x0071 ,7 , mode ==LGDT3306A_MPEG_PARALLEL ?1 :0 );/* TPSENB=0x80 */ +/* transport packet format - TPSENB=0x80 */ + ret =lgdt3306a_set_reg_bit (state,0x0071 ,7 , + mode ==LGDT3306A_MPEG_PARALLEL ?1 :0 );if (lg_chkerr (ret)) goto fail; -/* start of packet signal duration */ - ret =lgdt3306a_set_reg_bit (state,0x0071 ,6 ,0 );/* TPSSOPBITEN=0x40; 0=byte duration, 1=bit duration */ +/* +* start of packet signal duration +* TPSSOPBITEN=0x40; 0=byte duration, 1=bit duration +*/ + ret =lgdt3306a_set_reg_bit (state,0x0071 ,6 ,0 );if (lg_chkerr (ret)) goto fail;
@@ -285,17 +289,23 @@ static int lgdt3306a_mpeg_tristate(struct lgdt3306a_state *state, ret =lgdt3306a_read_reg (state,0x0070 , &val);if (lg_chkerr (ret)) goto fail; - val &= ~0xa8 ;/* Tristate bus; TPOUTEN=0x80, TPCLKOUTEN=0x20, TPDATAOUTEN=0x08 */ +/* +* Tristate bus; TPOUTEN=0x80, TPCLKOUTEN=0x20, +* TPDATAOUTEN=0x08 +*/ + val &= ~0xa8 ; ret =lgdt3306a_write_reg (state,0x0070 , val);if (lg_chkerr (ret)) goto fail; - ret =lgdt3306a_set_reg_bit (state,0x0003 ,6 ,1 );/* AGCIFOUTENB=0x40; 1=Disable IFAGC pin */ +/* AGCIFOUTENB=0x40; 1=Disable IFAGC pin */ + ret =lgdt3306a_set_reg_bit (state,0x0003 ,6 ,1 );if (lg_chkerr (ret)) goto fail; }else { - ret =lgdt3306a_set_reg_bit (state,0x0003 ,6 ,0 );/* enable IFAGC pin */ +/* enable IFAGC pin */ + ret =lgdt3306a_set_reg_bit (state,0x0003 ,6 ,0 );if (lg_chkerr (ret)) goto fail;
@@ -331,20 +341,24 @@ static int lgdt3306a_power(struct lgdt3306a_state *state,dbg_info ("(%d)\n" , mode);if (mode ==0 ) { - ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,0 );/* into reset */ +/* into reset */ + ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,0 );if (lg_chkerr (ret)) goto fail; - ret =lgdt3306a_set_reg_bit (state,0x0000 ,0 ,0 );/* power down */ +/* power down */ + ret =lgdt3306a_set_reg_bit (state,0x0000 ,0 ,0 );if (lg_chkerr (ret)) goto fail; }else { - ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,1 );/* out of reset */ +/* out of reset */ + ret =lgdt3306a_set_reg_bit (state,0x0000 ,7 ,1 );if (lg_chkerr (ret)) goto fail; - ret =lgdt3306a_set_reg_bit (state,0x0000 ,0 ,1 );/* power up */ +/* power up */ + ret =lgdt3306a_set_reg_bit (state,0x0000 ,0 ,1 );if (lg_chkerr (ret)) goto fail; }
@@ -658,8 +672,8 @@ static int lgdt3306a_set_inversion_auto(struct lgdt3306a_state *state,dbg_info ("(%d)\n" , enabled); -/* 0=Manual 1=Auto(QAM only) */ - ret =lgdt3306a_set_reg_bit (state,0x0002 ,3 , enabled);/* SPECINVAUTO=0x04 */ +/* 0=Manual 1=Auto(QAM only) - SPECINVAUTO=0x04 */ + ret =lgdt3306a_set_reg_bit (state,0x0002 ,3 , enabled);return ret; }
@@ -671,17 +685,22 @@ static int lgdt3306a_spectral_inversion(struct lgdt3306a_state *state,dbg_info ("(%d)\n" , inversion);#if 0 -/* FGR - spectral_inversion defaults already set for VSB and QAM; can enable later if desired */ +/* +* FGR - spectral_inversion defaults already set for VSB and QAM; +* can enable later if desired +*/ ret =lgdt3306a_set_inversion (state, inversion);switch (p->modulation) {case VSB_8 : - ret =lgdt3306a_set_inversion_auto (state,0 );/* Manual only for VSB */ +/* Manual only for VSB */ + ret =lgdt3306a_set_inversion_auto (state,0 );break ;case QAM_64 :case QAM_256 : - ret =lgdt3306a_set_inversion_auto (state,1 );/* Auto ok for QAM */ +/* Auto ok for QAM */ + ret =lgdt3306a_set_inversion_auto (state,1 );break ;default : ret = -EINVAL ;
@@ -711,7 +730,8 @@ static int lgdt3306a_set_if(struct lgdt3306a_state *state,switch (if_freq_khz) {default : -pr_warn ("IF=%d KHz is not supportted, 3250 assumed\n" , if_freq_khz); +pr_warn ("IF=%d KHz is not supportted, 3250 assumed\n" , + if_freq_khz);/* fallthrough */ case 3250 :/* 3.25Mhz */ nco1 =0x34 ;
@@ -758,7 +778,8 @@ static int lgdt3306a_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) }dbg_info ("(%d)\n" , enable); -return lgdt3306a_set_reg_bit (state,0x0002 ,7 , enable ?0 :1 );/* NI2CRPTEN=0x80 */ +/* NI2CRPTEN=0x80 */ +return lgdt3306a_set_reg_bit (state,0x0002 ,7 , enable ?0 :1 ); }static int lgdt3306a_sleep (struct lgdt3306a_state *state)
@@ -810,22 +831,30 @@ static int lgdt3306a_init(struct dvb_frontend *fe) goto fail;/* 4. Peak-to-peak voltage of ADC input signal */ - ret =lgdt3306a_set_reg_bit (state,0x0004 ,7 ,1 );/* ADCSEL1V=0x80=1Vpp; 0x00=2Vpp */ + +/* ADCSEL1V=0x80=1Vpp; 0x00=2Vpp */ + ret =lgdt3306a_set_reg_bit (state,0x0004 ,7 ,1 );if (lg_chkerr (ret)) goto fail;/* 5. ADC output data capture clock phase */ - ret =lgdt3306a_set_reg_bit (state,0x0004 ,2 ,0 );/* 0=same phase as ADC clock */ + +/* 0=same phase as ADC clock */ + ret =lgdt3306a_set_reg_bit (state,0x0004 ,2 ,0 );if (lg_chkerr (ret)) goto fail;/* 5a. ADC sampling clock source */ - ret =lgdt3306a_set_reg_bit (state,0x0004 ,3 ,0 );/* ADCCLKPLLSEL=0x08; 0=use ext clock, not PLL */ + +/* ADCCLKPLLSEL=0x08; 0=use ext clock, not PLL */ + ret =lgdt3306a_set_reg_bit (state,0x0004 ,3 ,0 );if (lg_chkerr (ret)) goto fail;/* 6. Automatic PLL set */ - ret =lgdt3306a_set_reg_bit (state,0x0005 ,6 ,0 );/* PLLSETAUTO=0x40; 0=off */ + +/* PLLSETAUTO=0x40; 0=off */ + ret =lgdt3306a_set_reg_bit (state,0x0005 ,6 ,0 );if (lg_chkerr (ret)) goto fail;
@@ -980,7 +1009,7 @@ static int lgdt3306a_set_parameters(struct dvb_frontend *fe) goto fail; ret =lgdt3306a_spectral_inversion (state, p, - state->cfg->spectral_inversion ?1 :0 ); + state->cfg->spectral_inversion ?1 :0 );if (lg_chkerr (ret)) goto fail;
@@ -1015,7 +1044,8 @@ static int lgdt3306a_get_frontend(struct dvb_frontend *fe)struct lgdt3306a_state *state = fe->demodulator_priv;struct dtv_frontend_properties *p = &fe->dtv_property_cache; -dbg_info ("(%u, %d)\n" , state->current_frequency, state->current_modulation); +dbg_info ("(%u, %d)\n" , + state->current_frequency, state->current_modulation); p->modulation = state->current_modulation; p->frequency = state->current_frequency;
@@ -1071,7 +1101,9 @@ static int lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)if (ret)return ret; val &=0xf8 ; -if ((snrRef >18 ) && (maxPowerMan >0x68 ) && (nCombDet ==0x01 ) && ((fbDlyCir ==0x03FF ) || (fbDlyCir <0x6C ))) { +if ((snrRef >18 ) && (maxPowerMan >0x68 ) + && (nCombDet ==0x01 ) + && ((fbDlyCir ==0x03FF ) || (fbDlyCir <0x6C ))) {/* SNR is over 18dB and no ghosting */ val |=0x00 ;/* final bandwidth = 0 */ }else {
@@ -1104,7 +1136,8 @@ static int lgdt3306a_monitor_vsb(struct lgdt3306a_state *state)return ret; } -static enum lgdt3306a_modulation lgdt3306a_check_oper_mode (struct lgdt3306a_state *state) +static enum lgdt3306a_modulation +lgdt3306a_check_oper_mode (struct lgdt3306a_state *state) {u8 val =0 ;int ret;
@@ -1134,8 +1167,9 @@ err:return LG3306_UNKNOWN_MODE ; } -static enum lgdt3306a_lock_status lgdt3306a_check_lock_status (struct lgdt3306a_state *state, -enum lgdt3306a_lock_check whatLock) +static enum lgdt3306a_lock_status +lgdt3306a_check_lock_status (struct lgdt3306a_state *state, +enum lgdt3306a_lock_check whatLock) {u8 val =0 ;int ret;
@@ -1219,7 +1253,8 @@ static enum lgdt3306a_lock_status lgdt3306a_check_lock_status(struct lgdt3306a_sreturn lockStatus; } -static enum lgdt3306a_neverlock_status lgdt3306a_check_neverlock_status (struct lgdt3306a_state *state) +static enum lgdt3306a_neverlock_status +lgdt3306a_check_neverlock_status (struct lgdt3306a_state *state) {u8 val =0 ;int ret;
@@ -1267,7 +1302,8 @@ static int lgdt3306a_pre_monitoring(struct lgdt3306a_state *state) snrRef, mainStrong, aiccrejStatus, currChDiffACQ);#if 0 - if ((mainStrong == 0) && (currChDiffACQ > 0x70)) /* Dynamic ghost exists */ +/* Dynamic ghost exists */ + if ((mainStrong == 0) && (currChDiffACQ > 0x70))#endif if (mainStrong ==0 ) { ret =lgdt3306a_read_reg (state,0x2135 , &val);
@@ -1317,7 +1353,8 @@ static int lgdt3306a_pre_monitoring(struct lgdt3306a_state *state)return 0 ; } -static enum lgdt3306a_lock_status lgdt3306a_sync_lock_poll (struct lgdt3306a_state *state) +static enum lgdt3306a_lock_status +lgdt3306a_sync_lock_poll (struct lgdt3306a_state *state) {enum lgdt3306a_lock_status syncLockStatus =LG3306_UNLOCK ;int i;
@@ -1325,7 +1362,8 @@ static enum lgdt3306a_lock_status lgdt3306a_sync_lock_poll(struct lgdt3306a_statfor (i =0 ; i <2 ; i++) {msleep (30 ); - syncLockStatus =lgdt3306a_check_lock_status (state,LG3306_SYNC_LOCK ); + syncLockStatus =lgdt3306a_check_lock_status (state, +LG3306_SYNC_LOCK );if (syncLockStatus ==LG3306_LOCK ) {dbg_info ("locked(%d)\n" , i);
@@ -1336,7 +1374,8 @@ static enum lgdt3306a_lock_status lgdt3306a_sync_lock_poll(struct lgdt3306a_statreturn LG3306_UNLOCK ; } -static enum lgdt3306a_lock_status lgdt3306a_fec_lock_poll (struct lgdt3306a_state *state) +static enum lgdt3306a_lock_status +lgdt3306a_fec_lock_poll (struct lgdt3306a_state *state) {enum lgdt3306a_lock_status FECLockStatus =LG3306_UNLOCK ;int i;
@@ -1344,7 +1383,8 @@ static enum lgdt3306a_lock_status lgdt3306a_fec_lock_poll(struct lgdt3306a_statefor (i =0 ; i <2 ; i++) {msleep (30 ); - FECLockStatus =lgdt3306a_check_lock_status (state,LG3306_FEC_LOCK ); + FECLockStatus =lgdt3306a_check_lock_status (state, +LG3306_FEC_LOCK );if (FECLockStatus ==LG3306_LOCK ) {dbg_info ("locked(%d)\n" , i);
@@ -1355,7 +1395,8 @@ static enum lgdt3306a_lock_status lgdt3306a_fec_lock_poll(struct lgdt3306a_statereturn FECLockStatus; } -static enum lgdt3306a_neverlock_status lgdt3306a_neverlock_poll (struct lgdt3306a_state *state) +static enum lgdt3306a_neverlock_status +lgdt3306a_neverlock_poll (struct lgdt3306a_state *state) {enum lgdt3306a_neverlock_status NLLockStatus =LG3306_NL_FAIL ;int i;
@@ -1458,7 +1499,8 @@ static u32 lgdt3306a_calculate_snr_x100(struct lgdt3306a_state *state)return snr_x100; } -static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll (struct lgdt3306a_state *state) +static enum lgdt3306a_lock_status +lgdt3306a_vsb_lock_poll (struct lgdt3306a_state *state) {int ret;u8 cnt =0 ;
@@ -1488,7 +1530,8 @@ static enum lgdt3306a_lock_status lgdt3306a_vsb_lock_poll(struct lgdt3306a_statereturn LG3306_UNLOCK ; } -static enum lgdt3306a_lock_status lgdt3306a_qam_lock_poll (struct lgdt3306a_state *state) +static enum lgdt3306a_lock_status +lgdt3306a_qam_lock_poll (struct lgdt3306a_state *state) {u8 cnt;u8 packet_error;
@@ -1632,7 +1675,7 @@ static int lgdt3306a_read_ber(struct dvb_frontend *fe, u32 *ber) *ber =0 ;#if 1 -/* FGR - BUGBUG - I don't know what value is expected by dvb_core +/* FGR - FIXME - I don't know what value is expected by dvb_core * what is the scale of the value?? */ tmp =read_reg (state,0x00fc );/* NBERVALUE[24-31] */ tmp = (tmp <<8 ) |read_reg (state,0x00fd );/* NBERVALUE[16-23] */
@@ -1650,7 +1693,7 @@ static int lgdt3306a_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) *ucblocks =0 ;#if 1 -/* FGR - BUGBUG - I don't know what value is expected by dvb_core +/* FGR - FIXME - I don't know what value is expected by dvb_core * what happens when value wraps? */ *ucblocks =read_reg (state,0x00f4 );/* TPIFTPERRCNT[0-7] */ dbg_info ("ucblocks=%u\n" , *ucblocks);
@@ -1659,7 +1702,9 @@ static int lgdt3306a_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)return 0 ; } -static int lgdt3306a_tune (struct dvb_frontend *fe,bool re_tune,unsigned int mode_flags,unsigned int *delay,fe_status_t *status) +static int lgdt3306a_tune (struct dvb_frontend *fe,bool re_tune, +unsigned int mode_flags,unsigned int *delay, +fe_status_t *status) {int ret =0 ;struct lgdt3306a_state *state = fe->demodulator_priv;
@@ -1761,7 +1806,8 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if ((val &0x74 ) !=0x74 ) {pr_warn ("expected 0x74, got 0x%x\n" , (val &0x74 ));#if 0 - goto fail;/* BUGBUG - re-enable when we know this is right */ +/* FIXME - re-enable when we know this is right */ + goto fail;#endif } ret =lgdt3306a_read_reg (state,0x0001 , &val);
@@ -1770,7 +1816,8 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if ((val &0xf6 ) !=0xc6 ) {pr_warn ("expected 0xc6, got 0x%x\n" , (val &0xf6 ));#if 0 - goto fail;/* BUGBUG - re-enable when we know this is right */ +/* FIXME - re-enable when we know this is right */ + goto fail;#endif } ret =lgdt3306a_read_reg (state,0x0002 , &val);
@@ -1779,7 +1826,8 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,if ((val &0x73 ) !=0x03 ) {pr_warn ("expected 0x03, got 0x%x\n" , (val &0x73 ));#if 0 - goto fail;/* BUGBUG - re-enable when we know this is right */ +/* FIXME - re-enable when we know this is right */ + goto fail;#endif }
Signature · 1 line
1.9.3
PATCH 13/13 lgdt3306a: Minor source code cleanups
In reply to Mauro Carvalho ChehabFix a few minor CodingStyle issues at the source code:
- Use proper multi-line comments;
- Align the log tables;
- Remove the .type from dvb_frontend_ops, since this is not needed anymore (since the drivers conversion to DVBv5);
- Remove emacs format macro.
drivers/media/dvb-frontends/lgdt3306a.c +12 -20
@@ -67,16 +67,17 @@ struct lgdt3306a_state {u32 snr; }; -/* ----------------------------------------------- -LG3306A Register Usage -(LG does not really name the registers, so this code does not either) -0000 -> 00FF Common control and status -1000 -> 10FF Synchronizer control and status -1F00 -> 1FFF Smart Antenna control and status -2100 -> 21FF VSB Equalizer control and status -2800 -> 28FF QAM Equalizer control and status -3000 -> 30FF FEC control and status ----------------------------------------------- */ +/* +* LG3306A Register Usage +* (LG does not really name the registers, so this code does not either) +* +* 0000 -> 00FF Common control and status +* 1000 -> 10FF Synchronizer control and status +* 1F00 -> 1FFF Smart Antenna control and status +* 2100 -> 21FF VSB Equalizer control and status +* 2800 -> 28FF QAM Equalizer control and status +* 3000 -> 30FF FEC control and status +*/ enum lgdt3306a_lock_status {LG3306_UNLOCK =0x00 ,
@@ -1431,7 +1432,7 @@ static const u32 valx_x10[] = {10 ,11 ,13 ,15 ,17 ,20 ,25 ,33 ,41 ,50 ,59 ,73 ,87 ,100 };static const u32 log10x_x1000[] = { -0 ,41 ,114 ,176 ,230 ,301 ,398 ,518 ,613 ,699 ,771 ,863 ,939 ,1000 +0 ,41 ,114 ,176 ,230 ,301 ,398 ,518 ,613 ,699 ,771 ,863 ,939 ,1000 };static u32 log10_x1000 (u32 x)
@@ -2113,9 +2114,6 @@ static struct dvb_frontend_ops lgdt3306a_ops = { .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B }, .info = { .name ="LG Electronics LGDT3306A VSB/QAM Frontend" , -#if 0 - .type = FE_ATSC, -#endif .frequency_min = 54000000, .frequency_max = 858000000, .frequency_stepsize = 62500,
@@ -2144,9 +2142,3 @@ MODULE_DESCRIPTION("LG Electronics LGDT3306A ATSC/QAM-B Demodulator Driver");MODULE_AUTHOR ("Fred Richter <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_VERSION ("0.2" ); - -/* -* Local variables: -* c-basic-offset: 8 -* End: -*/
drivers/media/dvb-frontends/lgdt3306a.h +0 -1
@@ -72,4 +72,3 @@ struct dvb_frontend *lgdt3306a_attach(const struct lgdt3306a_config *config,#endif /* CONFIG_DVB_LGDT3306A */ #endif /* _LGDT3306A_H_ */ -
Signature · 1 line
1.9.3