Merge master.kernel.org:/home/rmk/linux-2.6-arm

3 files changed, 6 insertions, 18 deletions

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index ddd0307fece2..48f6e872314b 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -47,12 +47,12 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hardware.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/amba_serial.h>
 
 #define UART_NR         2
 
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index d84476ee6592..129670556162 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -47,12 +47,12 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/clock.h>
-#include <asm/hardware/amba_serial.h>
 
 #define UART_NR                 14
 
@@ -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 47681c4654e4..fe83ce6fef52 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -72,12 +72,12 @@
 #include <linux/serial_core.h>
 #include <linux/serial.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 
 #include <asm/hardware.h>
-#include <asm/hardware/clock.h>
 
 #include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-gpio.h>
@@ -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);