PM: Introduce struct pm_subsys_data

[pandora-kernel.git] / drivers / base / power / clock_ops.c

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 2c18d58..b7f1db4 100644 (file)
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -17,11 +17,6 @@
 
 #ifdef CONFIG_PM
 
-struct pm_clk_data {
-       struct list_head clock_list;
-       spinlock_t lock;
-};
-
 enum pce_status {
        PCE_STATUS_NONE = 0,
        PCE_STATUS_ACQUIRED,
@@ -36,11 +31,6 @@ struct pm_clock_entry {
        enum pce_status status;
 };
 
-static struct pm_clk_data *__to_pcd(struct device *dev)
-{
-       return dev ? dev->power.subsys_data : NULL;
-}
-
 /**
  * pm_clk_add - Start using a device clock for power management.
  * @dev: Device whose clock is going to be used for power management.
@@ -51,10 +41,10 @@ static struct pm_clk_data *__to_pcd(struct device *dev)
  */
 int pm_clk_add(struct device *dev, const char *con_id)
 {
-       struct pm_clk_data *pcd = __to_pcd(dev);
+       struct pm_subsys_data *psd = dev_to_psd(dev);
        struct pm_clock_entry *ce;
 
-       if (!pcd)
+       if (!psd)
                return -EINVAL;
 
        ce = kzalloc(sizeof(*ce), GFP_KERNEL);
@@ -73,9 +63,9 @@ int pm_clk_add(struct device *dev, const char *con_id)
                }
        }
 
-       spin_lock_irq(&pcd->lock);
-       list_add_tail(&ce->node, &pcd->clock_list);
-       spin_unlock_irq(&pcd->lock);
+       spin_lock_irq(&psd->lock);
+       list_add_tail(&ce->node, &psd->clock_list);
+       spin_unlock_irq(&psd->lock);
        return 0;
 }
 
@@ -117,15 +107,15 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)
  */
 void pm_clk_remove(struct device *dev, const char *con_id)
 {
-       struct pm_clk_data *pcd = __to_pcd(dev);
+       struct pm_subsys_data *psd = dev_to_psd(dev);
        struct pm_clock_entry *ce;
 
-       if (!pcd)
+       if (!psd)
                return;
 
-       spin_lock_irq(&pcd->lock);
+       spin_lock_irq(&psd->lock);
 
-       list_for_each_entry(ce, &pcd->clock_list, node) {
+       list_for_each_entry(ce, &psd->clock_list, node) {
                if (!con_id && !ce->con_id) {
                        __pm_clk_remove(ce);
                        break;
@@ -137,29 +127,45 @@ void pm_clk_remove(struct device *dev, const char *con_id)
                }
        }
 
-       spin_unlock_irq(&pcd->lock);
+       spin_unlock_irq(&psd->lock);
 }
 
 /**
  * pm_clk_init - Initialize a device's list of power management clocks.
  * @dev: Device to initialize the list of PM clocks for.
  *
- * Allocate a struct pm_clk_data object, initialize its lock member and
- * make the @dev's power.subsys_data field point to it.
+ * Initialize the lock and clock_list members of the device's pm_subsys_data
+ * object.
  */
-int pm_clk_init(struct device *dev)
+void pm_clk_init(struct device *dev)
 {
-       struct pm_clk_data *pcd;
+       struct pm_subsys_data *psd = dev_to_psd(dev);
+
+       if (!psd)
+               return;
 
-       pcd = kzalloc(sizeof(*pcd), GFP_KERNEL);
-       if (!pcd) {
+       INIT_LIST_HEAD(&psd->clock_list);
+       spin_lock_init(&psd->lock);
+}
+
+/**
+ * pm_clk_create - Create and initialize a device's list of PM clocks.
+ * @dev: Device to create and initialize the list of PM clocks for.
+ *
+ * Allocate a struct pm_subsys_data object, initialize its lock and clock_list
+ * members and make the @dev's power.subsys_data field point to it.
+ */
+int pm_clk_create(struct device *dev)
+{
+       struct pm_subsys_data *psd;
+
+       psd = kzalloc(sizeof(*psd), GFP_KERNEL);
+       if (!psd) {
                dev_err(dev, "Not enough memory for PM clock data.\n");
                return -ENOMEM;
        }
-
-       INIT_LIST_HEAD(&pcd->clock_list);
-       spin_lock_init(&pcd->lock);
-       dev->power.subsys_data = pcd;
+       dev->power.subsys_data = psd;
+       pm_clk_init(dev);
        return 0;
 }
 
@@ -168,27 +174,27 @@ int pm_clk_init(struct device *dev)
  * @dev: Device to destroy the list of PM clocks for.
  *
  * Clear the @dev's power.subsys_data field, remove the list of clock entries
- * from the struct pm_clk_data object pointed to by it before and free
+ * from the struct pm_subsys_data object pointed to by it before and free
  * that object.
  */
 void pm_clk_destroy(struct device *dev)
 {
-       struct pm_clk_data *pcd = __to_pcd(dev);
+       struct pm_subsys_data *psd = dev_to_psd(dev);
        struct pm_clock_entry *ce, *c;
 
-       if (!pcd)
+       if (!psd)
                return;
 
        dev->power.subsys_data = NULL;
 
-       spin_lock_irq(&pcd->lock);
+       spin_lock_irq(&psd->lock);
 
-       list_for_each_entry_safe_reverse(ce, c, &pcd->clock_list, node)
+       list_for_each_entry_safe_reverse(ce, c, &psd->clock_list, node)
                __pm_clk_remove(ce);
 
-       spin_unlock_irq(&pcd->lock);
+       spin_unlock_irq(&psd->lock);
 
-       kfree(pcd);
+       kfree(psd);
 }
 
 #endif /* CONFIG_PM */
@@ -218,18 +224,18 @@ static void pm_clk_acquire(struct device *dev,
  */
 int pm_clk_suspend(struct device *dev)
 {
-       struct pm_clk_data *pcd = __to_pcd(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 (!pcd)
+       if (!psd)
                return 0;
 
-       spin_lock_irqsave(&pcd->lock, flags);
+       spin_lock_irqsave(&psd->lock, flags);
 
-       list_for_each_entry_reverse(ce, &pcd->clock_list, node) {
+       list_for_each_entry_reverse(ce, &psd->clock_list, node) {
                if (ce->status == PCE_STATUS_NONE)
                        pm_clk_acquire(dev, ce);
 
@@ -239,7 +245,7 @@ int pm_clk_suspend(struct device *dev)
                }
        }
 
-       spin_unlock_irqrestore(&pcd->lock, flags);
+       spin_unlock_irqrestore(&psd->lock, flags);
 
        return 0;
 }
@@ -250,18 +256,18 @@ int pm_clk_suspend(struct device *dev)
  */
 int pm_clk_resume(struct device *dev)
 {
-       struct pm_clk_data *pcd = __to_pcd(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 (!pcd)
+       if (!psd)
                return 0;
 
-       spin_lock_irqsave(&pcd->lock, flags);
+       spin_lock_irqsave(&psd->lock, flags);
 
-       list_for_each_entry(ce, &pcd->clock_list, node) {
+       list_for_each_entry(ce, &psd->clock_list, node) {
                if (ce->status == PCE_STATUS_NONE)
                        pm_clk_acquire(dev, ce);
 
@@ -271,7 +277,7 @@ int pm_clk_resume(struct device *dev)
                }
        }
 
-       spin_unlock_irqrestore(&pcd->lock, flags);
+       spin_unlock_irqrestore(&psd->lock, flags);
 
        return 0;
 }
@@ -309,7 +315,7 @@ static int pm_clk_notify(struct notifier_block *nb,
                if (dev->pm_domain)
                        break;
 
-               error = pm_clk_init(dev);
+               error = pm_clk_create(dev);
                if (error)
                        break;
 
@@ -344,22 +350,22 @@ static int pm_clk_notify(struct notifier_block *nb,
  */
 int pm_clk_suspend(struct device *dev)
 {
-       struct pm_clk_data *pcd = __to_pcd(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 (!pcd || !dev->driver)
+       if (!psd || !dev->driver)
                return 0;
 
-       spin_lock_irqsave(&pcd->lock, flags);
+       spin_lock_irqsave(&psd->lock, flags);
 
-       list_for_each_entry_reverse(ce, &pcd->clock_list, node)
+       list_for_each_entry_reverse(ce, &psd->clock_list, node)
                clk_disable(ce->clk);
 
-       spin_unlock_irqrestore(&pcd->lock, flags);
+       spin_unlock_irqrestore(&psd->lock, flags);
 
        return 0;
 }
@@ -370,22 +376,22 @@ int pm_clk_suspend(struct device *dev)
  */
 int pm_clk_resume(struct device *dev)
 {
-       struct pm_clk_data *pcd = __to_pcd(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 should remain disabled. */
-       if (!pcd || !dev->driver)
+       if (!psd || !dev->driver)
                return 0;
 
-       spin_lock_irqsave(&pcd->lock, flags);
+       spin_lock_irqsave(&psd->lock, flags);
 
-       list_for_each_entry(ce, &pcd->clock_list, node)
+       list_for_each_entry(ce, &psd->clock_list, node)
                clk_enable(ce->clk);
 
-       spin_unlock_irqrestore(&pcd->lock, flags);
+       spin_unlock_irqrestore(&psd->lock, flags);
 
        return 0;
 }