PM / Domains: Remove reference counting for the generic_pm_domain_data

The reference counting was needed when genpd supported PM domain device
callbacks. Since this option has been removed, let's also remove the
reference counting of the struct generic_pm_domain_data.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index f9e7df554b2f5d11b57f04407774828a577dfac0..351df5bbd9c92fe019b6005422d3ac25bc2f671b 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1456,7 +1456,6 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
                gpd_data = gpd_data_new;
                dev->power.subsys_data->domain_data = &gpd_data->base;
        }
-       gpd_data->refcount++;
        if (td)
                gpd_data->td = *td;
 
@@ -1504,7 +1503,6 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
 {
        struct generic_pm_domain_data *gpd_data;
        struct pm_domain_data *pdd;
-       bool remove = false;
        int ret = 0;
 
        dev_dbg(dev, "%s()\n", __func__);
@@ -1533,10 +1531,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
        pdd = dev->power.subsys_data->domain_data;
        list_del_init(&pdd->list_node);
        gpd_data = to_gpd_data(pdd);
-       if (--gpd_data->refcount == 0) {
-               dev->power.subsys_data->domain_data = NULL;
-               remove = true;
-       }
+       dev->power.subsys_data->domain_data = NULL;
 
        spin_unlock_irq(&dev->power.lock);
 
@@ -1547,8 +1542,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
        genpd_release_lock(genpd);
 
        dev_pm_put_subsys_data(dev);
-       if (remove)
-               genpd_free_dev_data(dev, gpd_data);
+       genpd_free_dev_data(dev, gpd_data);
 
        return 0;
 

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index ed607760fc208417864d202b7e7403f4ddfe3d07..e160a0bba28d06c11c42320a189aa68de87a0e39 100644 (file)
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -114,7 +114,6 @@ struct generic_pm_domain_data {
        struct gpd_timing_data td;
        struct notifier_block nb;
        struct mutex lock;
-       unsigned int refcount;
        int need_restore;
 };