V4L/DVB (12233): em28xx: rename is_27xx to is_webcam

Just renames the flag, to use a clearer name. Later patches will use
this flag to properly set some drivers behaviors for webcams.

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 ebd24a25fb8510043245cacfab39c1e4553ab624..8f869468280f3c6e0ed3ec156ea406bd8869b2be 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -450,7 +450,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2820_BOARD_SILVERCREST_WEBCAM] = {
                .name         = "Silvercrest Webcam 1.3mpix",
                .tuner_type   = TUNER_ABSENT,
-               .is_27xx      = 1,
+               .is_webcam    = 1,
                .decoder      = EM28XX_MT9V011,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
@@ -1772,7 +1772,7 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                        em28xx_info("chip ID is em2750\n");
                        break;
                case CHIP_ID_EM2820:
-                       if (dev->board.is_27xx)
+                       if (dev->board.is_webcam)
                                em28xx_info("chip is em2710\n");
                        else
                                em28xx_info("chip ID is em2820\n");

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 079ab4d563a62c4a41b6db6ff9d3df70a03a4e26..8649bdb7eb91c7e8441467c7abca4cdfefd81cc5 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -652,7 +652,7 @@ int em28xx_set_outfmt(struct em28xx *dev)
 
        outfmt  = dev->format->reg;
 
-       if (dev->board.is_27xx) {
+       if (dev->board.is_webcam) {
                vinmode = 0x0d;
                vinctl  = 0x00;
        } else {
@@ -707,7 +707,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)
        u8 mode;
        /* the em2800 scaler only supports scaling down to 50% */
 
-       if (dev->board.is_27xx) {
+       if (dev->board.is_webcam) {
                /* FIXME: Don't use the scaler yet */
                mode = 0;
        } else if (dev->board.is_em2800) {

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 14316c912179ab32b6b2ad456f10c83b66729d22..89ab2e3b9a2c84ed3bbe963c2f2816c3ded241f0 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -726,7 +726,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                return -EINVAL;
        }
 
-       if (dev->board.is_27xx) {
+       if (dev->board.is_webcam) {
                /* FIXME: This is the only supported fmt */
                width  = 640;
                height = 480;
@@ -768,7 +768,7 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc,
        struct em28xx_fmt     *fmt;
 
        /* FIXME: This is the only supported fmt */
-       if (dev->board.is_27xx) {
+       if (dev->board.is_webcam) {
                width  = 640;
                height = 480;
        }

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index d90fef463764646697ffe9ff1a69eeca7976c2c5..dc92e9ef85a45a5ec0acbb6132546985c6ea60e4 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -390,7 +390,7 @@ struct em28xx_board {
        unsigned int max_range_640_480:1;
        unsigned int has_dvb:1;
        unsigned int has_snapshot_button:1;
-       unsigned int is_27xx:1;
+       unsigned int is_webcam:1;
        unsigned int valid:1;
 
        unsigned char xclk, i2c_speed;