xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'powercap'

Browse Source 
* powercap:
  powercap: constify powercap_zone_ops and powercap_zone_constraint_ops structures
This commit is contained in:
Rafael J. Wysocki
2016-01-12 01:12:40 +01:00
parent 8f053a56df 600c395bf6
commit a889f766db
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/powercap/intel_rapl.c
View File

@@ -388,7 +388,7 @@ static int get_domain_enable(struct powercap_zone *power_zone, bool *mode)
} }
/* per RAPL domain ops, in the order of rapl_domain_type */ /* per RAPL domain ops, in the order of rapl_domain_type */
static struct powercap_zone_ops zone_ops[] = { static const struct powercap_zone_ops zone_ops[] = {
/* RAPL_DOMAIN_PACKAGE */ /* RAPL_DOMAIN_PACKAGE */
{ {
.get_energy_uj = get_energy_counter, .get_energy_uj = get_energy_counter,
@@ -584,7 +584,7 @@ static int get_max_power(struct powercap_zone *power_zone, int id,
return ret; return ret;
} }
static struct powercap_zone_constraint_ops constraint_ops = { static const struct powercap_zone_constraint_ops constraint_ops = {
.set_power_limit_uw = set_power_limit, .set_power_limit_uw = set_power_limit,
.get_power_limit_uw = get_current_power_limit, .get_power_limit_uw = get_current_power_limit,
.set_time_window_us = set_time_window, .set_time_window_us = set_time_window,

4
drivers/powercap/powercap_sys.c
View File

@@ -294,7 +294,7 @@ err_alloc:
static int create_constraints(struct powercap_zone *power_zone, static int create_constraints(struct powercap_zone *power_zone,
int nr_constraints, int nr_constraints,
struct powercap_zone_constraint_ops *const_ops) const struct powercap_zone_constraint_ops *const_ops)
{ {
int i; int i;
int ret = 0; int ret = 0;
@@ -498,7 +498,7 @@ struct powercap_zone *powercap_register_zone(
struct powercap_zone *parent, struct powercap_zone *parent,
const struct powercap_zone_ops *ops, const struct powercap_zone_ops *ops,
int nr_constraints, int nr_constraints,
struct powercap_zone_constraint_ops *const_ops) const struct powercap_zone_constraint_ops *const_ops)
{ {
int result; int result;
int nr_attrs; int nr_attrs;

4
include/linux/powercap.h
View File

@@ -208,7 +208,7 @@ struct powercap_zone_constraint_ops {
struct powercap_zone_constraint { struct powercap_zone_constraint {
int id; int id;
struct powercap_zone *power_zone; struct powercap_zone *power_zone;
struct powercap_zone_constraint_ops *ops; const struct powercap_zone_constraint_ops *ops;
}; };
@@ -309,7 +309,7 @@ struct powercap_zone *powercap_register_zone(
struct powercap_zone *parent, struct powercap_zone *parent,
const struct powercap_zone_ops *ops, const struct powercap_zone_ops *ops,
int nr_constraints, int nr_constraints,
struct powercap_zone_constraint_ops *const_ops); const struct powercap_zone_constraint_ops *const_ops);
/** /**
* powercap_unregister_zone() - Unregister a zone device * powercap_unregister_zone() - Unregister a zone device