From: Ulf Hansson <ulf.hansson@linaro.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Kevin Hilman <khilman@linaro.org>,
linux-pm@vger.kernel.org
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 2/8] PM / Domains: Remove reference counting for the generic_pm_domain_data
Date: Tue, 27 Jan 2015 21:13:39 +0100 [thread overview]
Message-ID: <1422389625-11730-3-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1422389625-11730-1-git-send-email-ulf.hansson@linaro.org>
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>
---
drivers/base/power/domain.c | 10 ++--------
include/linux/pm_domain.h | 1 -
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index f9e7df5..351df5b 100644
--- 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 ed60776..e160a0b 100644
--- 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;
};
--
1.9.1
next prev parent reply other threads:[~2015-01-27 20:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 20:13 [PATCH 0/8] PM / Domains: Re-structure code for adding/removing devices to genpd Ulf Hansson
2015-01-27 20:13 ` [PATCH 1/8] PM / Domains: Rename __pm_genpd_alloc|free_dev_data() Ulf Hansson
2015-01-28 10:06 ` Pavel Machek
2015-01-27 20:13 ` Ulf Hansson [this message]
2015-01-28 10:07 ` [PATCH 2/8] PM / Domains: Remove reference counting for the generic_pm_domain_data Pavel Machek
2015-01-27 20:13 ` [PATCH 3/8] PM / Domains: Don't allow an existing generic_pm_domain_data Ulf Hansson
2015-01-27 20:13 ` [PATCH 4/8] PM / Domains: Don't check for an existing device when adding a new Ulf Hansson
2015-01-27 20:13 ` [PATCH 5/8] PM / Domains: Eliminate the mutex for the generic_pm_domain_data Ulf Hansson
2015-01-27 20:13 ` [PATCH 6/8] PM / Domains: Free pm_subsys_data in error path in __pm_genpd_add_device() Ulf Hansson
2015-01-27 20:13 ` [PATCH 7/8] PM / Domains: Re-order initialization of generic_pm_domain_data Ulf Hansson
2015-01-27 20:13 ` [PATCH 8/8] PM / Domains: Handle errors from genpd's ->attach_dev() callback Ulf Hansson
2015-01-28 9:35 ` Geert Uytterhoeven
2015-01-29 10:32 ` [PATCH 0/8] PM / Domains: Re-structure code for adding/removing devices to genpd Geert Uytterhoeven
2015-02-04 14:39 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422389625-11730-3-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=dmitry.torokhov@gmail.com \
--cc=geert+renesas@glider.be \
--cc=khilman@linaro.org \
--cc=len.brown@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).