Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] em28xx: Fix a few warnings due to HVR-930C addition

Browse Source 
drivers/media/video/em28xx/em28xx-cards.c:339:30: warning: ‘hauppauge_930c_gpio’ defined but not used [-Wunused-variable]
drivers/media/video/em28xx/em28xx-dvb.c: In function ‘em28xx_dvb_init’:
drivers/media/video/em28xx/em28xx-dvb.c:886:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-11-24 15:01:45 -02:00
parent 1ec9a35e1c
commit 8503232f2e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/em28xx/em28xx-cards.c
View File

@ -336,6 +336,7 @@ static struct em28xx_reg_seq pctv_460e[] = {
{ -1, -1, -1, -1}, { -1, -1, -1, -1},
}; };
#if 0
static struct em28xx_reg_seq hauppauge_930c_gpio[] = { static struct em28xx_reg_seq hauppauge_930c_gpio[] = {
{EM2874_R80_GPIO, 0x6f, 0xff, 10}, {EM2874_R80_GPIO, 0x6f, 0xff, 10},
{EM2874_R80_GPIO, 0x4f, 0xff, 10}, /* xc5000 reset */ {EM2874_R80_GPIO, 0x4f, 0xff, 10}, /* xc5000 reset */
@ -344,7 +345,6 @@ static struct em28xx_reg_seq hauppauge_930c_gpio[] = {
{ -1, -1, -1, -1}, { -1, -1, -1, -1},
}; };
#if 0
static struct em28xx_reg_seq hauppauge_930c_digital[] = { static struct em28xx_reg_seq hauppauge_930c_digital[] = {
{EM2874_R80_GPIO, 0xf6, 0xff, 10}, {EM2874_R80_GPIO, 0xf6, 0xff, 10},
{EM2874_R80_GPIO, 0xe6, 0xff, 100}, {EM2874_R80_GPIO, 0xe6, 0xff, 100},

4
drivers/media/video/em28xx/em28xx-dvb.c
View File

@ -864,6 +864,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
} }
break; break;
case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C: case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
{
struct xc5000_config cfg;
hauppauge_hvr930c_init(dev); hauppauge_hvr930c_init(dev);
dvb->dont_attach_fe1 = 1; dvb->dont_attach_fe1 = 1;
@ -883,7 +885,6 @@ static int em28xx_dvb_init(struct em28xx *dev)
dvb->fe[1]->id = 1; dvb->fe[1]->id = 1;
/* Attach xc5000 */ /* Attach xc5000 */
struct xc5000_config cfg;
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
cfg.i2c_address = 0x61; cfg.i2c_address = 0x61;
cfg.if_khz = 4000; cfg.if_khz = 4000;
@ -906,6 +907,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
sizeof(dvb->fe[0]->ops.tuner_ops)); sizeof(dvb->fe[0]->ops.tuner_ops));
break; break;
}
case EM2884_BOARD_TERRATEC_H5: case EM2884_BOARD_TERRATEC_H5:
terratec_h5_init(dev); terratec_h5_init(dev);