i2c: stu300: use clk_prepare/unprepare

Make sure we prepare/unprepare the clock for the ST U300
I2C driver as is required by the clk API especially if you
use common clock.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 4d44af181f377f2d886fee0d42afb13265a6d32b..79b785150c15fd0854cde0bc177a63175fe6f4a1 100644 (file)
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -924,7 +924,7 @@ stu300_probe(struct platform_device *pdev)
 
        dev->speed = scl_frequency;
 
-       clk_enable(dev->clk);
+       clk_prepare_enable(dev->clk);
        ret = stu300_init_hw(dev);
        clk_disable(dev->clk);
 
@@ -960,6 +960,7 @@ stu300_probe(struct platform_device *pdev)
 
  err_add_adapter:
  err_init_hw:
+       clk_unprepare(dev->clk);
        free_irq(dev->irq, dev);
  err_no_irq:
        iounmap(dev->virtbase);
@@ -1016,6 +1017,7 @@ stu300_remove(struct platform_device *pdev)
        free_irq(dev->irq, dev);
        iounmap(dev->virtbase);
        release_mem_region(dev->phybase, dev->physize);
+       clk_unprepare(dev->clk);
        clk_put(dev->clk);
        platform_set_drvdata(pdev, NULL);
        kfree(dev);