4 files changed, 33 insertions, 61 deletions

diff --git a/drivers/video/omap2/dss/dispc-compat.c b/drivers/video/omap2/dss/dispc-compat.c
index cca38488ab27..24e1d5e974eb 100644
--- a/drivers/video/omap2/dss/dispc-compat.c
+++ b/drivers/video/omap2/dss/dispc-compat.c
@@ -205,3 +205,33 @@ void dispc_mgr_disable_sync(enum omap_channel channel)
                 WARN_ON(1);
 }
 
+int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
+                unsigned long timeout)
+{
+        void dispc_irq_wait_handler(void *data, u32 mask)
+        {
+                complete((struct completion *)data);
+        }
+
+        int r;
+        DECLARE_COMPLETION_ONSTACK(completion);
+
+        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
+                        irqmask);
+
+        if (r)
+                return r;
+
+        timeout = wait_for_completion_interruptible_timeout(&completion,
+                        timeout);
+
+        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
+
+        if (timeout == 0)
+                return -ETIMEDOUT;
+
+        if (timeout == -ERESTARTSYS)
+                return -ERESTARTSYS;
+
+        return 0;
+}
diff --git a/drivers/video/omap2/dss/dispc-compat.h b/drivers/video/omap2/dss/dispc-compat.h
index 2d4f5e77a7bf..8322d43d28c3 100644
--- a/drivers/video/omap2/dss/dispc-compat.h
+++ b/drivers/video/omap2/dss/dispc-compat.h
@@ -21,4 +21,7 @@
 void dispc_mgr_enable_sync(enum omap_channel channel);
 void dispc_mgr_disable_sync(enum omap_channel channel);
 
+int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
+                unsigned long timeout);
+
 #endif
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 73972e99ec63..f7c734214022 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3750,63 +3750,6 @@ static void dispc_error_worker(struct work_struct *work)
         dispc_runtime_put();
 }
 
-int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)
-{
-        void dispc_irq_wait_handler(void *data, u32 mask)
-        {
-                complete((struct completion *)data);
-        }
-
-        int r;
-        DECLARE_COMPLETION_ONSTACK(completion);
-
-        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
-                        irqmask);
-
-        if (r)
-                return r;
-
-        timeout = wait_for_completion_timeout(&completion, timeout);
-
-        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
-
-        if (timeout == 0)
-                return -ETIMEDOUT;
-
-        return 0;
-}
-
-int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
-                unsigned long timeout)
-{
-        void dispc_irq_wait_handler(void *data, u32 mask)
-        {
-                complete((struct completion *)data);
-        }
-
-        int r;
-        DECLARE_COMPLETION_ONSTACK(completion);
-
-        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
-                        irqmask);
-
-        if (r)
-                return r;
-
-        timeout = wait_for_completion_interruptible_timeout(&completion,
-                        timeout);
-
-        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
-
-        if (timeout == 0)
-                return -ETIMEDOUT;
-
-        if (timeout == -ERESTARTSYS)
-                return -ERESTARTSYS;
-
-        return 0;
-}
-
 static void _omap_dispc_initialize_irq(void)
 {
         unsigned long flags;
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index a9402362d817..823a07b00fe5 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -775,10 +775,6 @@ typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
 int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
 int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
 
-int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout);
-int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
-                unsigned long timeout);
-
 #define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)
 #define to_dss_device(x) container_of((x), struct omap_dss_device, dev)