OSDN Git Service

[media] em28xx: use the proper prefix for board names
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 1 Jun 2011 13:16:25 +0000 (10:16 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:52:16 +0000 (17:52 -0300)
All boards use EM28xxx_BOARD, to identify that the macro
refers to a card entry. So:

EM2874_LEADERSHIP_ISDBT -> EM2874_BOARD_LEADERSHIP_ISDBT

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/em28xx/em28xx-dvb.c
drivers/media/video/em28xx/em28xx.h

index f15c734..7635a45 100644 (file)
@@ -1259,7 +1259,7 @@ struct em28xx_board em28xx_boards[] = {
                } },
        },
 
-       [EM2874_LEADERSHIP_ISDBT] = {
+       [EM2874_BOARD_LEADERSHIP_ISDBT] = {
                .i2c_speed      = EM2874_I2C_SECONDARY_BUS_SELECT |
                                  EM28XX_I2C_CLK_WAIT_ENABLE |
                                  EM28XX_I2C_FREQ_100_KHZ,
@@ -1937,7 +1937,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
        {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT},
        {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
        {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
-       {0x6b800080, EM2874_LEADERSHIP_ISDBT, TUNER_ABSENT},
+       {0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
 };
 
 /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
index 7904ca4..012ab8e 100644 (file)
@@ -546,7 +546,7 @@ static int dvb_init(struct em28xx *dev)
        em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
        /* init frontend */
        switch (dev->model) {
-       case EM2874_LEADERSHIP_ISDBT:
+       case EM2874_BOARD_LEADERSHIP_ISDBT:
                dvb->fe[0] = dvb_attach(s921_attach,
                                &sharp_isdbt, &dev->i2c_adap);
 
index 3cca331..28b9954 100644 (file)
 #define EM2800_BOARD_VC211A                      74
 #define EM2882_BOARD_DIKOM_DK300                 75
 #define EM2870_BOARD_KWORLD_A340                 76
-#define EM2874_LEADERSHIP_ISDBT                          77
+#define EM2874_BOARD_LEADERSHIP_ISDBT                    77
 #define EM28174_BOARD_PCTV_290E                   78