forked from Minki/linux
V4L/DVB (9296): Patch to remove warning message during cx88-dvb compilation
Remove warning message during cx88-dvb compilation. Also fixes double underline in function and struct names. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
eb229b22fb
commit
d4305c68cc
@ -595,6 +595,18 @@ static void dm1105dvb_hw_exit(struct dm1105dvb *dm1105dvb)
|
||||
dm1105dvb_dma_unmap(dm1105dvb);
|
||||
}
|
||||
|
||||
static struct stv0299_config sharp_z0194a_config = {
|
||||
.demod_address = 0x68,
|
||||
.inittab = sharp_z0194a_inittab,
|
||||
.mclk = 88000000UL,
|
||||
.invert = 1,
|
||||
.skip_reinit = 0,
|
||||
.lock_output = STV0299_LOCKOUTPUT_1,
|
||||
.volt13_op0_op1 = STV0299_VOLT13_OP1,
|
||||
.min_delay_ms = 100,
|
||||
.set_symbol_rate = sharp_z0194a_set_symbol_rate,
|
||||
};
|
||||
|
||||
static struct stv0288_config earda_config = {
|
||||
.demod_address = 0x68,
|
||||
.min_delay_ms = 100,
|
||||
|
@ -422,6 +422,18 @@ static int dw210x_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct stv0299_config sharp_z0194a_config = {
|
||||
.demod_address = 0x68,
|
||||
.inittab = sharp_z0194a_inittab,
|
||||
.mclk = 88000000UL,
|
||||
.invert = 1,
|
||||
.skip_reinit = 0,
|
||||
.lock_output = STV0299_LOCKOUTPUT_1,
|
||||
.volt13_op0_op1 = STV0299_VOLT13_OP1,
|
||||
.min_delay_ms = 100,
|
||||
.set_symbol_rate = sharp_z0194a_set_symbol_rate,
|
||||
};
|
||||
|
||||
static struct cx24116_config dw2104_config = {
|
||||
.demod_address = 0x55,
|
||||
.mpg_clk_pos_pol = 0x01,
|
||||
|
@ -12,7 +12,7 @@
|
||||
#ifndef Z0194A
|
||||
#define Z0194A
|
||||
|
||||
static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,
|
||||
static int sharp_z0194a_set_symbol_rate(struct dvb_frontend *fe,
|
||||
u32 srate, u32 ratio)
|
||||
{
|
||||
u8 aclk = 0;
|
||||
@ -40,7 +40,7 @@ static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u8 sharp_z0194a__inittab[] = {
|
||||
static u8 sharp_z0194a_inittab[] = {
|
||||
0x01, 0x15,
|
||||
0x02, 0x00,
|
||||
0x03, 0x00,
|
||||
@ -82,16 +82,4 @@ static u8 sharp_z0194a__inittab[] = {
|
||||
0xff, 0xff
|
||||
};
|
||||
|
||||
static struct stv0299_config sharp_z0194a_config = {
|
||||
.demod_address = 0x68,
|
||||
.inittab = sharp_z0194a__inittab,
|
||||
.mclk = 88000000UL,
|
||||
.invert = 1,
|
||||
.skip_reinit = 0,
|
||||
.lock_output = STV0299_LOCKOUTPUT_1,
|
||||
.volt13_op0_op1 = STV0299_VOLT13_OP1,
|
||||
.min_delay_ms = 100,
|
||||
.set_symbol_rate = sharp_z0194a__set_symbol_rate,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -575,14 +575,14 @@ static struct cx24116_config tevii_s460_config = {
|
||||
|
||||
static struct stv0299_config tevii_tuner_sharp_config = {
|
||||
.demod_address = 0x68,
|
||||
.inittab = sharp_z0194a__inittab,
|
||||
.inittab = sharp_z0194a_inittab,
|
||||
.mclk = 88000000UL,
|
||||
.invert = 1,
|
||||
.skip_reinit = 0,
|
||||
.lock_output = 1,
|
||||
.volt13_op0_op1 = STV0299_VOLT13_OP1,
|
||||
.min_delay_ms = 100,
|
||||
.set_symbol_rate = sharp_z0194a__set_symbol_rate,
|
||||
.set_symbol_rate = sharp_z0194a_set_symbol_rate,
|
||||
.set_ts_params = cx24116_set_ts_param,
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user