diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-03 13:41:37 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-03 13:41:37 -0500 |
commit | a8d3584a2df28827094f6338cde1303c467bc1f0 (patch) | |
tree | d2cdb824f4b2f109ad6a74285455b56e5a2dd118 /drivers/serial/amba-pl011.c | |
parent | f47fc0ac7ead5ed91a11fcabfad6ee44c17ee934 (diff) |
[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>
Diffstat (limited to 'drivers/serial/amba-pl011.c')
-rw-r--r-- | drivers/serial/amba-pl011.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index d84476ee6592..531b0e4f25e5 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) | |||
761 | goto unmap; | 761 | goto unmap; |
762 | } | 762 | } |
763 | 763 | ||
764 | ret = clk_use(uap->clk); | ||
765 | if (ret) | ||
766 | goto putclk; | ||
767 | |||
768 | uap->port.dev = &dev->dev; | 764 | uap->port.dev = &dev->dev; |
769 | uap->port.mapbase = dev->res.start; | 765 | uap->port.mapbase = dev->res.start; |
770 | uap->port.membase = base; | 766 | uap->port.membase = base; |
@@ -782,8 +778,6 @@ static int pl011_probe(struct amba_device *dev, void *id) | |||
782 | if (ret) { | 778 | if (ret) { |
783 | amba_set_drvdata(dev, NULL); | 779 | amba_set_drvdata(dev, NULL); |
784 | amba_ports[i] = NULL; | 780 | amba_ports[i] = NULL; |
785 | clk_unuse(uap->clk); | ||
786 | putclk: | ||
787 | clk_put(uap->clk); | 781 | clk_put(uap->clk); |
788 | unmap: | 782 | unmap: |
789 | iounmap(base); | 783 | iounmap(base); |
@@ -808,7 +802,6 @@ static int pl011_remove(struct amba_device *dev) | |||
808 | amba_ports[i] = NULL; | 802 | amba_ports[i] = NULL; |
809 | 803 | ||
810 | iounmap(uap->port.membase); | 804 | iounmap(uap->port.membase); |
811 | clk_unuse(uap->clk); | ||
812 | clk_put(uap->clk); | 805 | clk_put(uap->clk); |
813 | kfree(uap); | 806 | kfree(uap); |
814 | return 0; | 807 | return 0; |