[ARM] Remove clk_use()/clk_unuse()

It seems that clk_use() and clk_unuse() are additional complexity
which isn't required anymore.  Remove them from the clock framework
to avoid the additional confusion which they cause, and update all
ARM machine types except for OMAP.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

10 files changed, 3 insertions, 47 deletions

diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index eb667daee1..621e8a99e7 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -397,7 +397,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        clk_use(wdt_clock);
         clk_enable(wdt_clock);
 
         /* see if we can actually set the requested timer margin, and if
@@ -444,7 +443,6 @@ static int s3c2410wdt_remove(struct platform_device *dev)
 
         if (wdt_clock != NULL) {
                 clk_disable(wdt_clock);
-                clk_unuse(wdt_clock);
                 clk_put(wdt_clock);
                 wdt_clock = NULL;
         }
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 58cfd3111e..2a2f86d8c2 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -738,7 +738,6 @@ static void s3c24xx_i2c_free(struct s3c24xx_i2c *i2c)
 {
         if (i2c->clk != NULL && !IS_ERR(i2c->clk)) {
                 clk_disable(i2c->clk);
-                clk_unuse(i2c->clk);
                 clk_put(i2c->clk);
                 i2c->clk = NULL;
         }
@@ -778,7 +777,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
         dev_dbg(&pdev->dev, "clock source %p\n", i2c->clk);
 
-        clk_use(i2c->clk);
         clk_enable(i2c->clk);
 
         /* map the registers */
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 9b1ab5e7a9..d847ed51cf 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -72,13 +72,9 @@ static int amba_kmi_open(struct serio *io)
         unsigned int divisor;
         int ret;
 
-        ret = clk_use(kmi->clk);
-        if (ret)
-                goto out;
-
         ret = clk_enable(kmi->clk);
         if (ret)
-                goto clk_unuse;
+                goto out;
 
         divisor = clk_get_rate(kmi->clk) / 8000000 - 1;
         writeb(divisor, KMICLKDIV);
@@ -97,8 +93,6 @@ static int amba_kmi_open(struct serio *io)
 
  clk_disable:
         clk_disable(kmi->clk);
- clk_unuse:
-        clk_unuse(kmi->clk);
  out:
         return ret;
 }
@@ -111,7 +105,6 @@ static void amba_kmi_close(struct serio *io)
 
         free_irq(kmi->irq, kmi);
         clk_disable(kmi->clk);
-        clk_unuse(kmi->clk);
 }
 
 static int amba_kmi_probe(struct amba_device *dev, void *id)
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 166c9b0ad0..31b0b6d612 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -479,13 +479,9 @@ static int mmci_probe(struct amba_device *dev, void *id)
                 goto host_free;
         }
 
-        ret = clk_use(host->clk);
-        if (ret)
-                goto clk_free;
-
         ret = clk_enable(host->clk);
         if (ret)
-                goto clk_unuse;
+                goto clk_free;
 
         host->plat = plat;
         host->mclk = clk_get_rate(host->clk);
@@ -558,8 +554,6 @@ static int mmci_probe(struct amba_device *dev, void *id)
         iounmap(host->base);
  clk_disable:
         clk_disable(host->clk);
- clk_unuse:
-        clk_unuse(host->clk);
  clk_free:
         clk_put(host->clk);
  host_free:
@@ -594,7 +588,6 @@ static int mmci_remove(struct amba_device *dev)
 
                 iounmap(host->base);
                 clk_disable(host->clk);
-                clk_unuse(host->clk);
                 clk_put(host->clk);
 
                 mmc_free_host(mmc);
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index d209214b13..b796a9a6b9 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -460,7 +460,6 @@ static int s3c2410_nand_remove(struct platform_device *pdev)
 
         if (info->clk != NULL && !IS_ERR(info->clk)) {
                 clk_disable(info->clk);
-                clk_unuse(info->clk);
                 clk_put(info->clk);
         }
 
@@ -598,7 +597,6 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
                 goto exit_error;
         }
 
-        clk_use(info->clk);
         clk_enable(info->clk);
 
         /* allocate and map the resource */
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index d84476ee65..531b0e4f25 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -761,10 +761,6 @@ static int pl011_probe(struct amba_device *dev, void *id)
                 goto unmap;
         }
 
-        ret = clk_use(uap->clk);
-        if (ret)
-                goto putclk;
-
         uap->port.dev = &dev->dev;
         uap->port.mapbase = dev->res.start;
         uap->port.membase = base;
@@ -782,8 +778,6 @@ static int pl011_probe(struct amba_device *dev, void *id)
         if (ret) {
                 amba_set_drvdata(dev, NULL);
                 amba_ports[i] = NULL;
-                clk_unuse(uap->clk);
- putclk:
                 clk_put(uap->clk);
  unmap:
                 iounmap(base);
@@ -808,7 +802,6 @@ static int pl011_remove(struct amba_device *dev)
                         amba_ports[i] = NULL;
 
         iounmap(uap->port.membase);
-        clk_unuse(uap->clk);
         clk_put(uap->clk);
         kfree(uap);
         return 0;
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 47681c4654..eb47f5b71a 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -782,11 +782,9 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
 
                 if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
                         clk_disable(ourport->baudclk);
-                        clk_unuse(ourport->baudclk);
                         ourport->baudclk  = NULL;
                 }
 
-                clk_use(clk);
                 clk_enable(clk);
 
                 ourport->clksrc = clksrc;
@@ -1077,9 +1075,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
 
-        if (ourport->clk != NULL && !IS_ERR(ourport->clk))
-                clk_use(ourport->clk);
-
         dbg("port: map=%08x, mem=%08x, irq=%d, clock=%ld\n",
             port->mapbase, port->membase, port->irq, port->uartclk);
 
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 35cc9402ad..add198a4be 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -363,7 +363,6 @@ int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
                 goto err1;
         }
 
-        clk_use(clk);
         s3c2410_start_hc(dev, hcd);
 
         hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
@@ -384,7 +383,6 @@ int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
  err2:
         s3c2410_stop_hc(dev);
         iounmap(hcd->regs);
-        clk_unuse(clk);
         clk_put(clk);
 
  err1:
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index a3c2c45e29..69421c8625 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -346,10 +346,6 @@ static int clcdfb_register(struct clcd_fb *fb)
                 goto out;
         }
 
-        ret = clk_use(fb->clk);
-        if (ret)
-                goto free_clk;
-
         fb->fb.fix.mmio_start   = fb->dev->res.start;
         fb->fb.fix.mmio_len     = SZ_4K;
 
@@ -357,7 +353,7 @@ static int clcdfb_register(struct clcd_fb *fb)
         if (!fb->regs) {
                 printk(KERN_ERR "CLCD: unable to remap registers\n");
                 ret = -ENOMEM;
-                goto unuse_clk;
+                goto free_clk;
         }
 
         fb->fb.fbops            = &clcdfb_ops;
@@ -427,8 +423,6 @@ static int clcdfb_register(struct clcd_fb *fb)
         printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret);
 
         iounmap(fb->regs);
- unuse_clk:
-        clk_unuse(fb->clk);
  free_clk:
         clk_put(fb->clk);
  out:
@@ -489,7 +483,6 @@ static int clcdfb_remove(struct amba_device *dev)
         clcdfb_disable(fb);
         unregister_framebuffer(&fb->fb);
         iounmap(fb->regs);
-        clk_unuse(fb->clk);
         clk_put(fb->clk);
 
         fb->board->remove(fb);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ce6e749db3..d9c08cc7ac 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -746,7 +746,6 @@ int __init s3c2410fb_probe(struct platform_device *pdev)
                 goto release_irq;
         }
 
-        clk_use(info->clk);
         clk_enable(info->clk);
         dprintk("got and enabled clock\n");
 
@@ -783,7 +782,6 @@ free_video_memory:
         s3c2410fb_unmap_video_memory(info);
 release_clock:
         clk_disable(info->clk);
-        clk_unuse(info->clk);
         clk_put(info->clk);
 release_irq:
         free_irq(irq,info);
@@ -828,7 +826,6 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
         if (info->clk) {
                 clk_disable(info->clk);
-                clk_unuse(info->clk);
                 clk_put(info->clk);
                 info->clk = NULL;
         }