Commit 15d56b39 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'

* pm-domains:
  PM / Domains: provide pm_genpd_poweroff_noirq() stub
  Revert "PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device"

* pm-sleep:
  PM / sleep: constify attribute_group structures

* pm-cpufreq:
  cpufreq: intel_pstate: constify attribute_group structures
  cpufreq: cpufreq_stats: constify attribute_group structures
...@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) ...@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)
{ {
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
genpd = genpd_lookup_dev(dev); genpd = dev_to_genpd(dev);
if (!genpd) if (!pm_genpd_present(genpd))
return; return;
if (suspend) { if (suspend) {
...@@ -1180,6 +1180,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); ...@@ -1180,6 +1180,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);
#define pm_genpd_resume_noirq NULL #define pm_genpd_resume_noirq NULL
#define pm_genpd_freeze_noirq NULL #define pm_genpd_freeze_noirq NULL
#define pm_genpd_thaw_noirq NULL #define pm_genpd_thaw_noirq NULL
#define pm_genpd_poweroff_noirq NULL
#define pm_genpd_restore_noirq NULL #define pm_genpd_restore_noirq NULL
#define pm_genpd_complete NULL #define pm_genpd_complete NULL
......
...@@ -135,7 +135,7 @@ static struct attribute *default_attrs[] = { ...@@ -135,7 +135,7 @@ static struct attribute *default_attrs[] = {
&trans_table.attr, &trans_table.attr,
NULL NULL
}; };
static struct attribute_group stats_attr_group = { static const struct attribute_group stats_attr_group = {
.attrs = default_attrs, .attrs = default_attrs,
.name = "stats" .name = "stats"
}; };
......
...@@ -1214,7 +1214,7 @@ static struct attribute *intel_pstate_attributes[] = { ...@@ -1214,7 +1214,7 @@ static struct attribute *intel_pstate_attributes[] = {
NULL NULL
}; };
static struct attribute_group intel_pstate_attr_group = { static const struct attribute_group intel_pstate_attr_group = {
.attrs = intel_pstate_attributes, .attrs = intel_pstate_attributes,
}; };
......
...@@ -705,7 +705,7 @@ static struct attribute * g[] = { ...@@ -705,7 +705,7 @@ static struct attribute * g[] = {
NULL, NULL,
}; };
static struct attribute_group attr_group = { static const struct attribute_group attr_group = {
.attrs = g, .attrs = g,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment