Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[karo-tx-linux.git] / drivers / mfd / tc6387xb.c

diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 591a331d8d83b147fbc10fa23351d61a05aeaf9e..85fab3729102545ddf0ac609f78f29804ae19846 100644 (file)
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -52,7 +52,7 @@ static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
 
        if (pdata && pdata->suspend)
                pdata->suspend(dev);
-       clk_disable(tc6387xb->clk32k);
+       clk_disable_unprepare(tc6387xb->clk32k);
 
        return 0;
 }
@@ -62,7 +62,7 @@ static int tc6387xb_resume(struct platform_device *dev)
        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
        struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev);
 
-       clk_enable(tc6387xb->clk32k);
+       clk_prepare_enable(tc6387xb->clk32k);
        if (pdata && pdata->resume)
                pdata->resume(dev);
 
@@ -100,7 +100,7 @@ static int tc6387xb_mmc_enable(struct platform_device *mmc)
        struct platform_device *dev      = to_platform_device(mmc->dev.parent);
        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
 
-       clk_enable(tc6387xb->clk32k);
+       clk_prepare_enable(tc6387xb->clk32k);
 
        tmio_core_mmc_enable(tc6387xb->scr + 0x200, 0,
                tc6387xb_mmc_resources[0].start & 0xfffe);
@@ -113,7 +113,7 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc)
        struct platform_device *dev      = to_platform_device(mmc->dev.parent);
        struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
 
-       clk_disable(tc6387xb->clk32k);
+       clk_disable_unprepare(tc6387xb->clk32k);
 
        return 0;
 }
@@ -147,11 +147,10 @@ static int tc6387xb_probe(struct platform_device *dev)
        int irq, ret;
 
        iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
-       if (!iomem) {
+       if (!iomem)
                return -EINVAL;
-       }
 
-       tc6387xb = kzalloc(sizeof *tc6387xb, GFP_KERNEL);
+       tc6387xb = kzalloc(sizeof(*tc6387xb), GFP_KERNEL);
        if (!tc6387xb)
                return -ENOMEM;
 
@@ -189,7 +188,7 @@ static int tc6387xb_probe(struct platform_device *dev)
        if (pdata && pdata->enable)
                pdata->enable(dev);
 
-       printk(KERN_INFO "Toshiba tc6387xb initialised\n");
+       dev_info(&dev->dev, "Toshiba tc6387xb initialised\n");
 
        ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
                              ARRAY_SIZE(tc6387xb_cells), iomem, irq, NULL);
@@ -215,7 +214,7 @@ static int tc6387xb_remove(struct platform_device *dev)
        mfd_remove_devices(&dev->dev);
        iounmap(tc6387xb->scr);
        release_resource(&tc6387xb->rscr);
-       clk_disable(tc6387xb->clk32k);
+       clk_disable_unprepare(tc6387xb->clk32k);
        clk_put(tc6387xb->clk32k);
        kfree(tc6387xb);