4 files changed, 10 insertions, 5 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 5028e31c564a..851f07de5296 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -116,6 +116,9 @@
 #define IVTV_REG_VPU                    (0x9058)
 #define IVTV_REG_APU                    (0xA064)
 
+/* Other registers */
+#define IVTV_REG_DEC_LINE_FIELD         (0x28C0)
+
 /* debugging */
 extern int ivtv_debug;
 
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 2192bc42c6b6..c29ff983d43e 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1140,7 +1140,7 @@ int ivtv_s_std(struct file *file, void *fh, v4l2_std_id *std)
                 for (f = 0; f < 4; f++) {
                         prepare_to_wait(&itv->vsync_waitq, &wait,
                                         TASK_UNINTERRUPTIBLE);
-                        if ((read_reg(0x28c0) >> 16) < 100)
+                        if ((read_reg(IVTV_REG_DEC_LINE_FIELD) >> 16) < 100)
                                 break;
                         schedule_timeout(msecs_to_jiffies(25));
                 }
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index 12d36ca91d53..dbd46c5d6975 100644
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -752,7 +752,7 @@ static void ivtv_irq_vsync(struct ivtv *itv)
          * to determine the line being displayed and ensure we handle
          * one vsync per frame.
          */
-        unsigned int frame = read_reg(0x28c0) & 1;
+        unsigned int frame = read_reg(IVTV_REG_DEC_LINE_FIELD) & 1;
         struct yuv_playback_info *yi = &itv->yuv_info;
         int last_dma_frame = atomic_read(&yi->next_dma_frame);
         struct yuv_frame_info *f = &yi->new_frame_info[last_dma_frame];
@@ -852,9 +852,11 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
                  */
                 if (~itv->irqmask & IVTV_IRQ_DEC_VSYNC) {
                         /* vsync is enabled, see if we're in a new field */
-                        if ((itv->last_vsync_field & 1) != (read_reg(0x28c0) & 1)) {
+                        if ((itv->last_vsync_field & 1) !=
+                            (read_reg(IVTV_REG_DEC_LINE_FIELD) & 1)) {
                                 /* New field, looks like we missed it */
-                                IVTV_DEBUG_YUV("VSync interrupt missed %d\n",read_reg(0x28c0)>>16);
+                                IVTV_DEBUG_YUV("VSync interrupt missed %d\n",
+                                       read_reg(IVTV_REG_DEC_LINE_FIELD) >> 16);
                                 vsync_force = 1;
                         }
                 }
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index de2ff1c6ac34..49e1a283ed36 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -460,7 +460,7 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
 
                         vblank.flags = FB_VBLANK_HAVE_COUNT |FB_VBLANK_HAVE_VCOUNT |
                                         FB_VBLANK_HAVE_VSYNC;
-                        trace = read_reg(0x028c0) >> 16;
+                        trace = read_reg(IVTV_REG_DEC_LINE_FIELD) >> 16;
                         if (itv->is_50hz && trace > 312)
                                 trace -= 312;
                         else if (itv->is_60hz && trace > 262)