V4L/DVB (4668): Cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOO

The flags for mpeg capabilities are sub-optimally named as
CX88_BOARD_DVB and CX88_BOARD_BLACKBIRD, which creates some confusion.
This patch renames the above to CX88_MPEG_DVB and CX88_MPEG_BLACKBIRD.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 957f37c7857a..d6d980774c21 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -65,17 +65,17 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
 
         /* FIXME: this needs a review.
          * also: move to cx88-blackbird + cx88-dvb source files? */
-        if (cx88_boards[core->board].mpeg == (CX88_BOARD_DVB | CX88_BOARD_BLACKBIRD) ) {
+        if (cx88_boards[core->board].mpeg == (CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD) ) {
                 /* Report a warning until the mini driver patch is applied,
                  * else the following conditions will set the dma registers incorrectly.
                  * This will be removed in the next major patch and changes to the conditions
                  * will be made.
                  */
-                printk(KERN_INFO "%s() board->(CX88_BOARD_DVB | CX88_BOARD_BLACKBIRD) is invalid\n", __FUNCTION__);
+                printk(KERN_INFO "%s() board->(CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD) is invalid\n", __FUNCTION__);
                 return -EINVAL;
         }
 
-        if (cx88_boards[core->board].mpeg & CX88_BOARD_DVB) {
+        if (cx88_boards[core->board].mpeg & CX88_MPEG_DVB) {
                 /* negedge driven & software reset */
                 cx_write(TS_GEN_CNTRL, 0x0040 | dev->ts_gen_cntrl);
                 udelay(100);
@@ -101,7 +101,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
                 udelay(100);
         }
 
-        if (cx88_boards[core->board].mpeg & CX88_BOARD_BLACKBIRD) {
+        if (cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD) {
                 cx_write(MO_PINMUX_IO, 0x88); /* enable MPEG parallel IO */
 
                 cx_write(TS_GEN_CNTRL, 0x46); /* punctured clock TS & posedge driven & software reset */