Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
parents 408c9861 af3eb274 1d0c6e59 106c9c77

drivers/base/power/domain.c

+3 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,8 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) 
{

	struct generic_pm_domain *genpd;



	genpd = genpd_lookup_dev(dev);

	if (!genpd)

	genpd = dev_to_genpd(dev);

	if (!pm_genpd_present(genpd))

		return;



	if (suspend) {
@@ -1180,6 +1180,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron); 
#define pm_genpd_resume_noirq		NULL

#define pm_genpd_freeze_noirq		NULL

#define pm_genpd_thaw_noirq		NULL

#define pm_genpd_poweroff_noirq		NULL

#define pm_genpd_restore_noirq		NULL

#define pm_genpd_complete		NULL

drivers/cpufreq/cpufreq_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static struct attribute *default_attrs[] = { 
	&trans_table.attr,

	NULL

};

static struct attribute_group stats_attr_group = {

static const struct attribute_group stats_attr_group = {

	.attrs = default_attrs,

	.name = "stats"

};

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ static struct attribute *intel_pstate_attributes[] = { 
	NULL

};



static struct attribute_group intel_pstate_attr_group = {

static const struct attribute_group intel_pstate_attr_group = {

	.attrs = intel_pstate_attributes,

};

kernel/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static struct attribute * g[] = { 
	NULL,

};



static struct attribute_group attr_group = {

static const struct attribute_group attr_group = {

	.attrs = g,

};