media: zoran: use ZR_NORM

Instead of using hardcoded numbers, let's use some define for ZR NORM.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
index 8f3faa4eb60f2c0076605436883263270f37a612..87ca324f6ec2d0355984b5ba5c23b6bc49bd81a3 100644 (file)
--- a/drivers/staging/media/zoran/zoran.h
+++ b/drivers/staging/media/zoran/zoran.h
@@ -22,6 +22,10 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
 
+#define ZR_NORM_PAL 0
+#define ZR_NORM_NTSC 1
+#define ZR_NORM_SECAM 2
+
 struct zoran_sync {
        unsigned long frame;    /* number of buffer that has been free'd */
        unsigned long length;   /* number of code bytes in buffer (capture only) */

diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index 9fe2bc2b036af67428c6a7168f662eed93aa31cd..8be7f8f0a02020fca10bba406f21845507e18aec 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -911,18 +911,18 @@ static int zr36057_init(struct zoran *zr)
                default_norm = 0;
        if (default_norm == 0) {
                zr->norm = V4L2_STD_PAL;
-               zr->timing = zr->card.tvn[0];
+               zr->timing = zr->card.tvn[ZR_NORM_PAL];
        } else if (default_norm == 1) {
                zr->norm = V4L2_STD_NTSC;
-               zr->timing = zr->card.tvn[1];
+               zr->timing = zr->card.tvn[ZR_NORM_NTSC];
        } else {
                zr->norm = V4L2_STD_SECAM;
-               zr->timing = zr->card.tvn[2];
+               zr->timing = zr->card.tvn[ZR_NORM_SECAM];
        }
        if (!zr->timing) {
                pci_warn(zr->pci_dev, "%s - default TV standard not supported by hardware. PAL will be used.\n", __func__);
                zr->norm = V4L2_STD_PAL;
-               zr->timing = zr->card.tvn[0];
+               zr->timing = zr->card.tvn[ZR_NORM_PAL];
        }
 
        if (default_input > zr->card.inputs - 1) {

diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c
index b910ad136b84d1911eb3d20af3a277a5dfbc73cc..858e0910884c62aed30ca7d33c099e258f7aabae 100644 (file)
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -1033,11 +1033,11 @@ static int zoran_set_norm(struct zoran *zr, v4l2_std_id norm)
        }
 
        if (norm & V4L2_STD_SECAM)
-               zr->timing = zr->card.tvn[2];
+               zr->timing = zr->card.tvn[ZR_NORM_SECAM];
        else if (norm & V4L2_STD_NTSC)
-               zr->timing = zr->card.tvn[1];
+               zr->timing = zr->card.tvn[ZR_NORM_NTSC];
        else
-               zr->timing = zr->card.tvn[0];
+               zr->timing = zr->card.tvn[ZR_NORM_PAL];
 
        decoder_call(zr, video, s_std, norm);
        encoder_call(zr, video, s_std_output, norm);