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

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>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index f63a7159f7fc03461acfc1bde48dbef6d37e854b..5b0336b6d83e23580e6cfbd5c5ff154208dccf2d 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -336,6 +336,7 @@ static struct em28xx_reg_seq pctv_460e[] = {
        {             -1,   -1,   -1,  -1},
 };
 
+#if 0
 static struct em28xx_reg_seq hauppauge_930c_gpio[] = {
        {EM2874_R80_GPIO,       0x6f,   0xff,   10},
        {EM2874_R80_GPIO,       0x4f,   0xff,   10}, /* xc5000 reset */
@@ -344,7 +345,6 @@ static struct em28xx_reg_seq hauppauge_930c_gpio[] = {
        { -1,                   -1,     -1,     -1},
 };
 
-#if 0
 static struct em28xx_reg_seq hauppauge_930c_digital[] = {
        {EM2874_R80_GPIO,       0xf6,   0xff,   10},
        {EM2874_R80_GPIO,       0xe6,   0xff,   100},

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