ARM: OMAP: 4/4 Fix clock framework to use clk_enable/disable misc

This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>

6 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 7a68f098a025..e924e0c6a4ce 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -146,7 +146,7 @@ void __init omap_serial_init(void)
                         if (IS_ERR(uart1_ck))
                                 printk("Could not get uart1_ck\n");
                         else {
-                                clk_use(uart1_ck);
+                                clk_enable(uart1_ck);
                                 if (cpu_is_omap1510())
                                         clk_set_rate(uart1_ck, 12000000);
                         }
@@ -166,7 +166,7 @@ void __init omap_serial_init(void)
                         if (IS_ERR(uart2_ck))
                                 printk("Could not get uart2_ck\n");
                         else {
-                                clk_use(uart2_ck);
+                                clk_enable(uart2_ck);
                                 if (cpu_is_omap1510())
                                         clk_set_rate(uart2_ck, 12000000);
                                 else
@@ -188,7 +188,7 @@ void __init omap_serial_init(void)
                         if (IS_ERR(uart3_ck))
                                 printk("Could not get uart3_ck\n");
                         else {
-                                clk_use(uart3_ck);
+                                clk_enable(uart3_ck);
                                 if (cpu_is_omap1510())
                                         clk_set_rate(uart3_ck, 12000000);
                         }
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index e1bd46a96e11..24dd374224af 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -119,14 +119,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart1_ick))
                                 printk("Could not get uart1_ick\n");
                         else {
-                                clk_use(uart1_ick);
+                                clk_enable(uart1_ick);
                         }
 
                         uart1_fck = clk_get(NULL, "uart1_fck");
                         if (IS_ERR(uart1_fck))
                                 printk("Could not get uart1_fck\n");
                         else {
-                                clk_use(uart1_fck);
+                                clk_enable(uart1_fck);
                         }
                         break;
                 case 1:
@@ -134,14 +134,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart2_ick))
                                 printk("Could not get uart2_ick\n");
                         else {
-                                clk_use(uart2_ick);
+                                clk_enable(uart2_ick);
                         }
 
                         uart2_fck = clk_get(NULL, "uart2_fck");
                         if (IS_ERR(uart2_fck))
                                 printk("Could not get uart2_fck\n");
                         else {
-                                clk_use(uart2_fck);
+                                clk_enable(uart2_fck);
                         }
                         break;
                 case 2:
@@ -149,14 +149,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart3_ick))
                                 printk("Could not get uart3_ick\n");
                         else {
-                                clk_use(uart3_ick);
+                                clk_enable(uart3_ick);
                         }
 
                         uart3_fck = clk_get(NULL, "uart3_fck");
                         if (IS_ERR(uart3_fck))
                                 printk("Could not get uart3_fck\n");
                         else {
-                                clk_use(uart3_fck);
+                                clk_enable(uart3_fck);
                         }
                         break;
                 }
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 23d36b1c40fe..1d2f5ac2f69b 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -104,7 +104,7 @@ static void __init omap2_gp_timer_init(void)
         if (IS_ERR(sys_ck))
                 printk(KERN_ERR "Could not get sys_ck\n");
         else {
-                clk_use(sys_ck);
+                clk_enable(sys_ck);
                 tick_period = clk_get_rate(sys_ck) / 100;
                 clk_put(sys_ck);
         }
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index ca3681a824ac..b4d5b9e4bfce 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -853,19 +853,19 @@ static int __init _omap_gpio_init(void)
                 if (IS_ERR(gpio_ick))
                         printk("Could not get arm_gpio_ck\n");
                 else
-                        clk_use(gpio_ick);
+                        clk_enable(gpio_ick);
         }
         if (cpu_is_omap24xx()) {
                 gpio_ick = clk_get(NULL, "gpios_ick");
                 if (IS_ERR(gpio_ick))
                         printk("Could not get gpios_ick\n");
                 else
-                        clk_use(gpio_ick);
+                        clk_enable(gpio_ick);
                 gpio_fck = clk_get(NULL, "gpios_fck");
                 if (IS_ERR(gpio_ick))
                         printk("Could not get gpios_fck\n");
                 else
-                        clk_use(gpio_fck);
+                        clk_enable(gpio_fck);
         }
 
 #ifdef CONFIG_ARCH_OMAP15XX
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index be0e0f32a598..1cd2cace7e1b 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -190,11 +190,11 @@ static int omap_mcbsp_check(unsigned int id)
 static void omap_mcbsp_dsp_request(void)
 {
         if (cpu_is_omap1510() || cpu_is_omap16xx()) {
-                clk_use(mcbsp_dsp_ck);
-                clk_use(mcbsp_api_ck);
+                clk_enable(mcbsp_dsp_ck);
+                clk_enable(mcbsp_api_ck);
 
                 /* enable 12MHz clock to mcbsp 1 & 3 */
-                clk_use(mcbsp_dspxor_ck);
+                clk_enable(mcbsp_dspxor_ck);
 
                 /*
                  * DSP external peripheral reset
@@ -208,9 +208,9 @@ static void omap_mcbsp_dsp_request(void)
 static void omap_mcbsp_dsp_free(void)
 {
         if (cpu_is_omap1510() || cpu_is_omap16xx()) {
-                clk_unuse(mcbsp_dspxor_ck);
-                clk_unuse(mcbsp_dsp_ck);
-                clk_unuse(mcbsp_api_ck);
+                clk_disable(mcbsp_dspxor_ck);
+                clk_disable(mcbsp_dsp_ck);
+                clk_disable(mcbsp_api_ck);
         }
 }
 
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index e40fcc8b43d4..5cc6775c789c 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -88,7 +88,7 @@ static int __init omap_ocpi_init(void)
         if (IS_ERR(ocpi_ck))
                 return PTR_ERR(ocpi_ck);
 
-        clk_use(ocpi_ck);
+        clk_enable(ocpi_ck);
         ocpi_enable();
         printk("OMAP OCPI interconnect driver loaded\n");
 
@@ -102,7 +102,7 @@ static void __exit omap_ocpi_exit(void)
         if (!cpu_is_omap16xx())
                 return;
 
-        clk_unuse(ocpi_ck);
+        clk_disable(ocpi_ck);
         clk_put(ocpi_ck);
 }