fbdev: sh_mobile_lcdc: Pass channel pointer to sh_mobile_wait_for_vsync

The sh_mobile_wait_for_vsync() function isn't related to the fbdev API,
make it generic by passing a channel pointer instead of an fb_info
pointer.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 23 insertions, 24 deletions

diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 6d377b48c138..adc911f20033 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -585,6 +585,26 @@ static irqreturn_t sh_mobile_lcdc_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+static int sh_mobile_wait_for_vsync(struct sh_mobile_lcdc_chan *ch)
+{
+        unsigned long ldintr;
+        int ret;
+
+        /* Enable VSync End interrupt and be careful not to acknowledge any
+         * pending interrupt.
+         */
+        ldintr = lcdc_read(ch->lcdc, _LDINTR);
+        ldintr |= LDINTR_VEE | LDINTR_STATUS_MASK;
+        lcdc_write(ch->lcdc, _LDINTR, ldintr);
+
+        ret = wait_for_completion_interruptible_timeout(&ch->vsync_completion,
+                                                        msecs_to_jiffies(100));
+        if (!ret)
+                return -ETIMEDOUT;
+
+        return 0;
+}
+
 static void sh_mobile_lcdc_start_stop(struct sh_mobile_lcdc_priv *priv,
                                       int start)
 {
@@ -1083,27 +1103,6 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
         return 0;
 }
 
-static int sh_mobile_wait_for_vsync(struct fb_info *info)
-{
-        struct sh_mobile_lcdc_chan *ch = info->par;
-        unsigned long ldintr;
-        int ret;
-
-        /* Enable VSync End interrupt and be careful not to acknowledge any
-         * pending interrupt.
-         */
-        ldintr = lcdc_read(ch->lcdc, _LDINTR);
-        ldintr |= LDINTR_VEE | LDINTR_STATUS_MASK;
-        lcdc_write(ch->lcdc, _LDINTR, ldintr);
-
-        ret = wait_for_completion_interruptible_timeout(&ch->vsync_completion,
-                                                        msecs_to_jiffies(100));
-        if (!ret)
-                return -ETIMEDOUT;
-
-        return 0;
-}
-
 static int sh_mobile_ioctl(struct fb_info *info, unsigned int cmd,
                        unsigned long arg)
 {
@@ -1111,7 +1110,7 @@ static int sh_mobile_ioctl(struct fb_info *info, unsigned int cmd,
 
         switch (cmd) {
         case FBIO_WAITFORVSYNC:
-                retval = sh_mobile_wait_for_vsync(info);
+                retval = sh_mobile_wait_for_vsync(info->par);
                 break;
 
         default:
@@ -1388,8 +1387,8 @@ static int sh_mobile_lcdc_blank(int blank, struct fb_info *info)
                  * mode will reenable the clocks and update the screen in time,
                  * so it does not need this. */
                 if (!info->fbdefio) {
-                        sh_mobile_wait_for_vsync(info);
-                        sh_mobile_wait_for_vsync(info);
+                        sh_mobile_wait_for_vsync(ch);
+                        sh_mobile_wait_for_vsync(ch);
                 }
                 sh_mobile_lcdc_clk_off(p);
         }