ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro

Now that omap_test_timeout is only accessible from mach-omap2/,
introduce a similar function for SR.

This change makes the SmartReflex implementation ready for the move
to drivers/.

Signed-off-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index d8592771838f..acef08d837cc 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -289,9 +289,9 @@ static void sr_v1_disable(struct omap_sr *sr)
          * Wait for SR to be disabled.
          * wait until ERRCONFIG.MCUDISACKINTST = 1. Typical latency is 1us.
          */
-        omap_test_timeout((sr_read_reg(sr, ERRCONFIG_V1) &
-                        ERRCONFIG_MCUDISACKINTST), SR_DISABLE_TIMEOUT,
-                        timeout);
+        sr_test_cond_timeout((sr_read_reg(sr, ERRCONFIG_V1) &
+                             ERRCONFIG_MCUDISACKINTST), SR_DISABLE_TIMEOUT,
+                             timeout);
 
         if (timeout >= SR_DISABLE_TIMEOUT)
                 dev_warn(&sr->pdev->dev, "%s: Smartreflex disable timedout\n",
@@ -334,9 +334,9 @@ static void sr_v2_disable(struct omap_sr *sr)
          * Wait for SR to be disabled.
          * wait until IRQSTATUS.MCUDISACKINTST = 1. Typical latency is 1us.
          */
-        omap_test_timeout((sr_read_reg(sr, IRQSTATUS) &
-                        IRQSTATUS_MCUDISABLEACKINT), SR_DISABLE_TIMEOUT,
-                        timeout);
+        sr_test_cond_timeout((sr_read_reg(sr, IRQSTATUS) &
+                             IRQSTATUS_MCUDISABLEACKINT), SR_DISABLE_TIMEOUT,
+                             timeout);
 
         if (timeout >= SR_DISABLE_TIMEOUT)
                 dev_warn(&sr->pdev->dev, "%s: Smartreflex disable timedout\n",