PM: Drop CONFIG_PM_RUNTIME from the driver core

[linux-drm-fsl-dcu.git] / drivers / base / power / clock_ops.c

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 78369305e0698109a42b172af8b925c05209701d..d626576a4f755b522febe3662a3e554eb38582e8 100644 (file)
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -12,6 +12,7 @@
 #include <linux/pm.h>
 #include <linux/pm_clock.h>
 #include <linux/clk.h>
+#include <linux/clkdev.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 
@@ -34,14 +35,20 @@ struct pm_clock_entry {
 /**
  * pm_clk_enable - Enable a clock, reporting any errors
  * @dev: The device for the given clock
- * @clk: The clock being enabled.
+ * @ce: PM clock entry corresponding to the clock.
  */
-static inline int __pm_clk_enable(struct device *dev, struct clk *clk)
+static inline int __pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
 {
-       int ret = clk_enable(clk);
-       if (ret)
-               dev_err(dev, "%s: failed to enable clk %p, error %d\n",
-                       __func__, clk, ret);
+       int ret;
+
+       if (ce->status < PCE_STATUS_ERROR) {
+               ret = clk_enable(ce->clk);
+               if (!ret)
+                       ce->status = PCE_STATUS_ENABLED;
+               else
+                       dev_err(dev, "%s: failed to enable clk %p, error %d\n",
+                               __func__, ce->clk, ret);
+       }
 
        return ret;
 }
@@ -53,7 +60,8 @@ static inline int __pm_clk_enable(struct device *dev, struct clk *clk)
  */
 static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce)
 {
-       ce->clk = clk_get(dev, ce->con_id);
+       if (!ce->clk)
+               ce->clk = clk_get(dev, ce->con_id);
        if (IS_ERR(ce->clk)) {
                ce->status = PCE_STATUS_ERROR;
        } else {
@@ -63,15 +71,8 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce)
        }
 }
 
-/**
- * pm_clk_add - Start using a device clock for power management.
- * @dev: Device whose clock is going to be used for power management.
- * @con_id: Connection ID of the clock.
- *
- * Add the clock represented by @con_id to the list of clocks used for
- * the power management of @dev.
- */
-int pm_clk_add(struct device *dev, const char *con_id)
+static int __pm_clk_add(struct device *dev, const char *con_id,
+                       struct clk *clk)
 {
        struct pm_subsys_data *psd = dev_to_psd(dev);
        struct pm_clock_entry *ce;
@@ -93,6 +94,12 @@ int pm_clk_add(struct device *dev, const char *con_id)
                        kfree(ce);
                        return -ENOMEM;
                }
+       } else {
+               if (IS_ERR(ce->clk) || !__clk_get(clk)) {
+                       kfree(ce);
+                       return -ENOENT;
+               }
+               ce->clk = clk;
        }
 
        pm_clk_acquire(dev, ce);
@@ -103,6 +110,32 @@ int pm_clk_add(struct device *dev, const char *con_id)
        return 0;
 }
 
+/**
+ * pm_clk_add - Start using a device clock for power management.
+ * @dev: Device whose clock is going to be used for power management.
+ * @con_id: Connection ID of the clock.
+ *
+ * Add the clock represented by @con_id to the list of clocks used for
+ * the power management of @dev.
+ */
+int pm_clk_add(struct device *dev, const char *con_id)
+{
+       return __pm_clk_add(dev, con_id, NULL);
+}
+
+/**
+ * pm_clk_add_clk - Start using a device clock for power management.
+ * @dev: Device whose clock is going to be used for power management.
+ * @clk: Clock pointer
+ *
+ * Add the clock to the list of clocks used for the power management of @dev.
+ * It will increment refcount on clock pointer, use clk_put() on it when done.
+ */
+int pm_clk_add_clk(struct device *dev, struct clk *clk)
+{
+       return __pm_clk_add(dev, NULL, clk);
+}
+
 /**
  * __pm_clk_remove - Destroy PM clock entry.
  * @ce: PM clock entry to destroy.
@@ -223,10 +256,6 @@ void pm_clk_destroy(struct device *dev)
        }
 }
 
-#endif /* CONFIG_PM */
-
-#ifdef CONFIG_PM_RUNTIME
-
 /**
  * pm_clk_suspend - Disable clocks in a device's PM clock list.
  * @dev: Device to disable the clocks for.
@@ -266,7 +295,6 @@ int pm_clk_resume(struct device *dev)
        struct pm_subsys_data *psd = dev_to_psd(dev);
        struct pm_clock_entry *ce;
        unsigned long flags;
-       int ret;
 
        dev_dbg(dev, "%s()\n", __func__);
 
@@ -275,13 +303,8 @@ int pm_clk_resume(struct device *dev)
 
        spin_lock_irqsave(&psd->lock, flags);
 
-       list_for_each_entry(ce, &psd->clock_list, node) {
-               if (ce->status < PCE_STATUS_ERROR) {
-                       ret = __pm_clk_enable(dev, ce->clk);
-                       if (!ret)
-                               ce->status = PCE_STATUS_ENABLED;
-               }
-       }
+       list_for_each_entry(ce, &psd->clock_list, node)
+               __pm_clk_enable(dev, ce);
 
        spin_unlock_irqrestore(&psd->lock, flags);
 
@@ -346,74 +369,7 @@ static int pm_clk_notify(struct notifier_block *nb,
        return 0;
 }
 
-#else /* !CONFIG_PM_RUNTIME */
-
-#ifdef CONFIG_PM
-
-/**
- * pm_clk_suspend - Disable clocks in a device's PM clock list.
- * @dev: Device to disable the clocks for.
- */
-int pm_clk_suspend(struct device *dev)
-{
-       struct pm_subsys_data *psd = dev_to_psd(dev);
-       struct pm_clock_entry *ce;
-       unsigned long flags;
-
-       dev_dbg(dev, "%s()\n", __func__);
-
-       /* If there is no driver, the clocks are already disabled. */
-       if (!psd || !dev->driver)
-               return 0;
-
-       spin_lock_irqsave(&psd->lock, flags);
-
-       list_for_each_entry_reverse(ce, &psd->clock_list, node) {
-               if (ce->status < PCE_STATUS_ERROR) {
-                       if (ce->status == PCE_STATUS_ENABLED)
-                               clk_disable(ce->clk);
-                       ce->status = PCE_STATUS_ACQUIRED;
-               }
-       }
-
-       spin_unlock_irqrestore(&psd->lock, flags);
-
-       return 0;
-}
-
-/**
- * pm_clk_resume - Enable clocks in a device's PM clock list.
- * @dev: Device to enable the clocks for.
- */
-int pm_clk_resume(struct device *dev)
-{
-       struct pm_subsys_data *psd = dev_to_psd(dev);
-       struct pm_clock_entry *ce;
-       unsigned long flags;
-       int ret;
-
-       dev_dbg(dev, "%s()\n", __func__);
-
-       /* If there is no driver, the clocks should remain disabled. */
-       if (!psd || !dev->driver)
-               return 0;
-
-       spin_lock_irqsave(&psd->lock, flags);
-
-       list_for_each_entry(ce, &psd->clock_list, node) {
-               if (ce->status < PCE_STATUS_ERROR) {
-                       ret = __pm_clk_enable(dev, ce->clk);
-                       if (!ret)
-                               ce->status = PCE_STATUS_ENABLED;
-               }
-       }
-
-       spin_unlock_irqrestore(&psd->lock, flags);
-
-       return 0;
-}
-
-#endif /* CONFIG_PM */
+#else /* !CONFIG_PM */
 
 /**
  * enable_clock - Enable a device clock.
@@ -493,7 +449,7 @@ static int pm_clk_notify(struct notifier_block *nb,
        return 0;
 }
 
-#endif /* !CONFIG_PM_RUNTIME */
+#endif /* !CONFIG_PM */
 
 /**
  * pm_clk_add_notifier - Add bus type notifier for power management clocks.