Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os 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>

authored by

Igor M. Liplianin and committed by
Mauro Carvalho Chehab
d4305c68 eb229b22

+28 -16
+12
drivers/media/dvb/dm1105/dm1105.c
··· 595 595 dm1105dvb_dma_unmap(dm1105dvb); 596 596 } 597 597 598 + static struct stv0299_config sharp_z0194a_config = { 599 + .demod_address = 0x68, 600 + .inittab = sharp_z0194a_inittab, 601 + .mclk = 88000000UL, 602 + .invert = 1, 603 + .skip_reinit = 0, 604 + .lock_output = STV0299_LOCKOUTPUT_1, 605 + .volt13_op0_op1 = STV0299_VOLT13_OP1, 606 + .min_delay_ms = 100, 607 + .set_symbol_rate = sharp_z0194a_set_symbol_rate, 608 + }; 609 + 598 610 static struct stv0288_config earda_config = { 599 611 .demod_address = 0x68, 600 612 .min_delay_ms = 100,
+12
drivers/media/dvb/dvb-usb/dw2102.c
··· 422 422 return 0; 423 423 } 424 424 425 + static struct stv0299_config sharp_z0194a_config = { 426 + .demod_address = 0x68, 427 + .inittab = sharp_z0194a_inittab, 428 + .mclk = 88000000UL, 429 + .invert = 1, 430 + .skip_reinit = 0, 431 + .lock_output = STV0299_LOCKOUTPUT_1, 432 + .volt13_op0_op1 = STV0299_VOLT13_OP1, 433 + .min_delay_ms = 100, 434 + .set_symbol_rate = sharp_z0194a_set_symbol_rate, 435 + }; 436 + 425 437 static struct cx24116_config dw2104_config = { 426 438 .demod_address = 0x55, 427 439 .mpg_clk_pos_pol = 0x01,
+2 -14
drivers/media/dvb/frontends/z0194a.h
··· 12 12 #ifndef Z0194A 13 13 #define Z0194A 14 14 15 - static int sharp_z0194a__set_symbol_rate(struct dvb_frontend *fe, 15 + static int sharp_z0194a_set_symbol_rate(struct dvb_frontend *fe, 16 16 u32 srate, u32 ratio) 17 17 { 18 18 u8 aclk = 0; ··· 40 40 return 0; 41 41 } 42 42 43 - static u8 sharp_z0194a__inittab[] = { 43 + static u8 sharp_z0194a_inittab[] = { 44 44 0x01, 0x15, 45 45 0x02, 0x00, 46 46 0x03, 0x00, ··· 80 80 0x34, 0x93, /* error control */ 81 81 0x0f, 0x52, 82 82 0xff, 0xff 83 - }; 84 - 85 - static struct stv0299_config sharp_z0194a_config = { 86 - .demod_address = 0x68, 87 - .inittab = sharp_z0194a__inittab, 88 - .mclk = 88000000UL, 89 - .invert = 1, 90 - .skip_reinit = 0, 91 - .lock_output = STV0299_LOCKOUTPUT_1, 92 - .volt13_op0_op1 = STV0299_VOLT13_OP1, 93 - .min_delay_ms = 100, 94 - .set_symbol_rate = sharp_z0194a__set_symbol_rate, 95 83 }; 96 84 97 85 #endif
+2 -2
drivers/media/video/cx88/cx88-dvb.c
··· 575 575 576 576 static struct stv0299_config tevii_tuner_sharp_config = { 577 577 .demod_address = 0x68, 578 - .inittab = sharp_z0194a__inittab, 578 + .inittab = sharp_z0194a_inittab, 579 579 .mclk = 88000000UL, 580 580 .invert = 1, 581 581 .skip_reinit = 0, 582 582 .lock_output = 1, 583 583 .volt13_op0_op1 = STV0299_VOLT13_OP1, 584 584 .min_delay_ms = 100, 585 - .set_symbol_rate = sharp_z0194a__set_symbol_rate, 585 + .set_symbol_rate = sharp_z0194a_set_symbol_rate, 586 586 .set_ts_params = cx24116_set_ts_param, 587 587 }; 588 588