Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343804
b: refs/heads/master
c: 8c8ca1c
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Oct 27, 2012
1 parent 96fdd9c commit 371a519
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5506bcba19709a5ace1cecaa82ff1374ef4dcc99
refs/heads/master: 8c8ca1c7ca837e20a265fef97272f61064a9b1d5
19 changes: 10 additions & 9 deletions trunk/drivers/media/dvb-frontends/stv0367.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,15 +879,16 @@ static u8 stv0367_readbits(struct stv0367_state *state, u32 label)
return val;
}

u8 stv0367_getbits(u8 reg, u32 label)
#if 0 /* Currently, unused */
static u8 stv0367_getbits(u8 reg, u32 label)
{
u8 mask, pos;

extract_mask_pos(label, &mask, &pos);

return (reg & mask) >> pos;
}

#endif
static int stv0367ter_gate_ctrl(struct dvb_frontend *fe, int enable)
{
struct stv0367_state *state = fe->demodulator_priv;
Expand Down Expand Up @@ -1263,8 +1264,8 @@ stv0367_ter_signal_type stv0367ter_check_cpamp(struct stv0367_state *state,
return CPAMPStatus;
}

enum
stv0367_ter_signal_type stv0367ter_lock_algo(struct stv0367_state *state)
static enum stv0367_ter_signal_type
stv0367ter_lock_algo(struct stv0367_state *state)
{
enum stv0367_ter_signal_type ret_flag;
short int wd, tempo;
Expand Down Expand Up @@ -1528,7 +1529,7 @@ static int stv0367ter_sleep(struct dvb_frontend *fe)
return stv0367ter_standby(fe, 1);
}

int stv0367ter_init(struct dvb_frontend *fe)
static int stv0367ter_init(struct dvb_frontend *fe)
{
struct stv0367_state *state = fe->demodulator_priv;
struct stv0367ter_state *ter_state = state->ter_state;
Expand Down Expand Up @@ -2378,9 +2379,9 @@ static u32 stv0367cab_get_adc_freq(struct dvb_frontend *fe, u32 ExtClk_Hz)
return ADCClk_Hz;
}

enum stv0367cab_mod stv0367cab_SetQamSize(struct stv0367_state *state,
u32 SymbolRate,
enum stv0367cab_mod QAMSize)
static enum stv0367cab_mod stv0367cab_SetQamSize(struct stv0367_state *state,
u32 SymbolRate,
enum stv0367cab_mod QAMSize)
{
/* Set QAM size */
stv0367_writebits(state, F367CAB_QAM_MODE, QAMSize);
Expand Down Expand Up @@ -2762,7 +2763,7 @@ static int stv0367cab_sleep(struct dvb_frontend *fe)
return stv0367cab_standby(fe, 1);
}

int stv0367cab_init(struct dvb_frontend *fe)
static int stv0367cab_init(struct dvb_frontend *fe)
{
struct stv0367_state *state = fe->demodulator_priv;
struct stv0367cab_state *cab_state = state->cab_state;
Expand Down

0 comments on commit 371a519

Please sign in to comment.