diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-22 11:41:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-27 09:25:53 +0100 |
| commit | 72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9 (patch) | |
| tree | bb3314bee1991c2909c50a61e7bb0f76e4b8bd88 /arch/arm/common | |
| parent | 52ca0f3ab568497adeac217e4167b51d9b4d4884 (diff) | |
| download | blackbird-obmc-linux-72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9.tar.gz blackbird-obmc-linux-72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9.zip | |
clk: sa1111: convert to clk_prepare()/clk_unprepare()
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/sa1111.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 0569de6acfba..61691cdbdcf2 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -718,6 +718,10 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) goto err_free; } + ret = clk_prepare(sachip->clk); + if (ret) + goto err_clkput; + spin_lock_init(&sachip->lock); sachip->dev = me; @@ -733,7 +737,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) sachip->base = ioremap(mem->start, PAGE_SIZE * 2); if (!sachip->base) { ret = -ENOMEM; - goto err_clkput; + goto err_clk_unprep; } /* @@ -809,6 +813,8 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) err_unmap: iounmap(sachip->base); + err_clk_unprep: + clk_unprepare(sachip->clk); err_clkput: clk_put(sachip->clk); err_free: @@ -835,6 +841,7 @@ static void __sa1111_remove(struct sa1111 *sachip) sa1111_writel(0, irqbase + SA1111_WAKEEN1); clk_disable(sachip->clk); + clk_unprepare(sachip->clk); if (sachip->irq != NO_IRQ) { irq_set_chained_handler(sachip->irq, NULL); |
