3 files changed, 7 insertions, 23 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 96f07d1473fb..28f48f41f218 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -1052,22 +1052,13 @@ int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
 /* Set resolution of the video */
 int cx231xx_resolution_set(struct cx231xx *dev)
 {
-        int width, height;
-        u32 hscale, vscale;
-        int status = 0;
-
-        width = dev->width;
-        height = dev->height;
-
-        get_scale(dev, width, height, &hscale, &vscale);
-
         /* set horzontal scale */
-        status = vid_blk_write_word(dev, HSCALE_CTRL, hscale);
+        int status = vid_blk_write_word(dev, HSCALE_CTRL, dev->hscale);
+        if (status)
+                return status;
 
         /* set vertical scale */
-        status = vid_blk_write_word(dev, VSCALE_CTRL, vscale);
-
-        return status;
+        return vid_blk_write_word(dev, VSCALE_CTRL, dev->vscale);
 }
 
 /******************************************************************************
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 6a524d847110..609bae6098d3 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -893,9 +893,9 @@ static int check_dev(struct cx231xx *dev)
         return 0;
 }
 
-void get_scale(struct cx231xx *dev,
-               unsigned int width, unsigned int height,
-               unsigned int *hscale, unsigned int *vscale)
+static void get_scale(struct cx231xx *dev,
+                      unsigned int width, unsigned int height,
+                      unsigned int *hscale, unsigned int *vscale)
 {
         unsigned int maxw = norm_maxw(dev);
         unsigned int maxh = norm_maxh(dev);
@@ -907,10 +907,6 @@ void get_scale(struct cx231xx *dev,
         *vscale = (((unsigned long)maxh) << 12) / height - 4096L;
         if (*vscale >= 0x4000)
                 *vscale = 0x3fff;
-
-        dev->hscale = *hscale;
-        dev->vscale = *vscale;
-
 }
 
 /* ------------------------------------------------------------------
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index e38eb2d425f7..a0f823ac6b8d 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -722,9 +722,6 @@ int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input);
 int cx231xx_set_decoder_video_input(struct cx231xx *dev, u8 pin_type, u8 input);
 int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev);
 int cx231xx_set_audio_input(struct cx231xx *dev, u8 input);
-void get_scale(struct cx231xx *dev,
-               unsigned int width, unsigned int height,
-               unsigned int *hscale, unsigned int *vscale);
 
 /* Provided by cx231xx-video.c */
 int cx231xx_register_extension(struct cx231xx_ops *dev);