openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] dib3000mc: Fix indentation 

drivers/media/dvb-frontends/dib3000mc.c:134 dib3000mc_setup_pwm_state() warn: inconsistent indenting
drivers/media/dvb-frontends/dib3000mc.c:144 dib3000mc_setup_pwm_state() warn: inconsistent indenting
drivers/media/dvb-frontends/dib3000mc.c:420 dib3000mc_sleep() warn: inconsistent indenting
drivers/media/dvb-frontends/dib3000mc.c:453 dib3000mc_set_channel_cfg() warn: inconsistent indenting

The last one is actually due to a commented code. Let's rework
it, in order to remove the sparse warning without removing the
dead code, as it may be useful in the future.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-04-28 18:29:05 -03:00
parent 361f2e8d97
commit c7a092e36e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/dvb-frontends/dib3000mc.c
View File

@ -131,7 +131,7 @@ static int dib3000mc_set_timing(struct dib3000mc_state *state, s16 nfft, u32 bw,
static int dib3000mc_setup_pwm_state(struct dib3000mc_state *state) static int dib3000mc_setup_pwm_state(struct dib3000mc_state *state)
{ {
u16 reg_51, reg_52 = state->cfg->agc->setup & 0xfefb; u16 reg_51, reg_52 = state->cfg->agc->setup & 0xfefb;
if (state->cfg->pwm3_inversion) { if (state->cfg->pwm3_inversion) {
reg_51 = (2 << 14) | (0 << 10) | (7 << 6) | (2 << 2) | (2 << 0); reg_51 = (2 << 14) | (0 << 10) | (7 << 6) | (2 << 2) | (2 << 0);
reg_52 |= (1 << 2); reg_52 |= (1 << 2);
} else { } else {
@ -141,7 +141,7 @@ static int dib3000mc_setup_pwm_state(struct dib3000mc_state *state)
dib3000mc_write_word(state, 51, reg_51); dib3000mc_write_word(state, 51, reg_51);
dib3000mc_write_word(state, 52, reg_52); dib3000mc_write_word(state, 52, reg_52);
if (state->cfg->use_pwm3) if (state->cfg->use_pwm3)
dib3000mc_write_word(state, 245, (1 << 3) | (1 << 0)); dib3000mc_write_word(state, 245, (1 << 3) | (1 << 0));
else else
dib3000mc_write_word(state, 245, 0); dib3000mc_write_word(state, 245, 0);
@ -417,7 +417,7 @@ static int dib3000mc_sleep(struct dvb_frontend *demod)
dib3000mc_write_word(state, 1032, 0xFFFF); dib3000mc_write_word(state, 1032, 0xFFFF);
dib3000mc_write_word(state, 1033, 0xFFF0); dib3000mc_write_word(state, 1033, 0xFFF0);
return 0; return 0;
} }
static void dib3000mc_set_adp_cfg(struct dib3000mc_state *state, s16 qam) static void dib3000mc_set_adp_cfg(struct dib3000mc_state *state, s16 qam)
@ -447,10 +447,14 @@ static void dib3000mc_set_channel_cfg(struct dib3000mc_state *state,
dib3000mc_set_bandwidth(state, bw); dib3000mc_set_bandwidth(state, bw);
dib3000mc_set_timing(state, ch->transmission_mode, bw, 0); dib3000mc_set_timing(state, ch->transmission_mode, bw, 0);
// if (boost) #if 1
// dib3000mc_write_word(state, 100, (11 << 6) + 6); dib3000mc_write_word(state, 100, (16 << 6) + 9);
// else #else
if (boost)
dib3000mc_write_word(state, 100, (11 << 6) + 6);
else
dib3000mc_write_word(state, 100, (16 << 6) + 9); dib3000mc_write_word(state, 100, (16 << 6) + 9);
#endif
dib3000mc_write_word(state, 1027, 0x0800); dib3000mc_write_word(state, 1027, 0x0800);
dib3000mc_write_word(state, 1027, 0x0000); dib3000mc_write_word(state, 1027, 0x0000);