В сообщении от 17 October 2008 18:47:36 Mauro Carvalho Chehab написал(а):
> Hi Stoth and Igor,
>
> There's one warning at cx88-dvb, due to sharp_z0194a_config symbol,
> declared inside z0194a.h:
>
> CC [M] /home/v4l/master/v4l/cx88-dvb.o
> /home/v4l/master/v4l/z0194a.h:85: warning: 'sharp_z0194a_config' defined
> but not used
>
> This symbol is used by both dm1105.c and dw2102.c with stv0299, but it is
> not used on cx88-dvb (there, this tuner is used with cx24116).
>
> I'm not sure what's the better way to fix, but I suspect that the better
> would be to move this symbol into dm1105.c and dw2102.c.
>
>
> Cheers,
> Mauro
>
Patch to remove warning message during cx88-dvb compilation.
Also fixes double underline in function and struct names.
Igor
# HG changeset patch
# User Igor M. Liplianin <liplianin@xxxxx>
# Date 1224261955 -10800
# Node ID 3f6e9ce1887cb0f4938b94d7bb36b5cf19df9b2b
# Parent 5cc39cee38bacc3120c43c1528288c145fad20b8
Patch to remove warning message during cx88-dvb compilation
From: Igor M. Liplianin <liplianin@xxxxx>
Remove warning message during cx88-dvb compilation.
Also fixes double underline in function and struct names.
Signed-off-by: Igor M. Liplianin <liplianin@xxxxx>
diff -r 5cc39cee38ba -r 3f6e9ce1887c linux/drivers/media/dvb/dm1105/dm1105.c
--- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Oct 17 13:43:33 2008 +0200
+++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Oct 17 19:45:55 2008 +0300
@@ -603,6 +603,18 @@
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,
diff -r 5cc39cee38ba -r 3f6e9ce1887c linux/drivers/media/dvb/dvb-usb/dw2102.c
--- a/linux/drivers/media/dvb/dvb-usb/dw2102.c Fri Oct 17 13:43:33 2008 +0200
+++ b/linux/drivers/media/dvb/dvb-usb/dw2102.c Fri Oct 17 19:45:55 2008 +0300
@@ -422,6 +422,18 @@
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,
diff -r 5cc39cee38ba -r 3f6e9ce1887c linux/drivers/media/dvb/frontends/z0194a.h
--- a/linux/drivers/media/dvb/frontends/z0194a.h Fri Oct 17 13:43:33 2008 +0200
+++ b/linux/drivers/media/dvb/frontends/z0194a.h Fri Oct 17 19:45:55 2008 +0300
@@ -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 @@
return 0;
}
-static u8 sharp_z0194a__inittab[] = {
+static u8 sharp_z0194a_inittab[] = {
0x01, 0x15,
0x02, 0x00,
0x03, 0x00,
@@ -82,16 +82,4 @@
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
diff -r 5cc39cee38ba -r 3f6e9ce1887c linux/drivers/media/video/cx88/cx88-dvb.c
--- a/linux/drivers/media/video/cx88/cx88-dvb.c Fri Oct 17 13:43:33 2008 +0200
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Oct 17 19:45:55 2008 +0300
@@ -582,14 +582,14 @@
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,
};
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
