mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[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 <[email protected]>
This commit is contained in:
parent
f47fc0ac7e
commit
a8d3584a2d
18 changed files with 3 additions and 122 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue