Commit 07891f15 authored by Lukasz Luba's avatar Lukasz Luba Committed by Rafael J. Wysocki
Browse files

PM / EM: remove em_register_perf_domain 



Remove old function em_register_perf_domain which is no longer needed.
There is em_dev_register_perf_domain that covers old use cases and new as
well.

Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1bc138c6

include/linux/energy_model.h

+0 −7
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ struct em_data_callback { 


struct em_perf_domain *em_cpu_get(int cpu);

struct em_perf_domain *em_pd_get(struct device *dev);

int em_register_perf_domain(cpumask_t *span, unsigned int nr_states,

						struct em_data_callback *cb);

int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,

				struct em_data_callback *cb, cpumask_t *span);

void em_dev_unregister_perf_domain(struct device *dev);
@@ -181,11 +179,6 @@ static inline int em_pd_nr_perf_states(struct em_perf_domain *pd) 
struct em_data_callback {};

#define EM_DATA_CB(_active_power_cb) { }



static inline int em_register_perf_domain(cpumask_t *span,

			unsigned int nr_states, struct em_data_callback *cb)

{

	return -EINVAL;

}

static inline

int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,

				struct em_data_callback *cb, cpumask_t *span)

kernel/power/energy_model.c

+0 −25
Original line number Diff line number Diff line
@@ -322,31 +322,6 @@ unlock: 
}

EXPORT_SYMBOL_GPL(em_dev_register_perf_domain);



/**

 * em_register_perf_domain() - Register the Energy Model of a performance domain

 * @span	: Mask of CPUs in the performance domain

 * @nr_states	: Number of capacity states to register

 * @cb		: Callback functions providing the data of the Energy Model

 *

 * Create Energy Model tables for a performance domain using the callbacks

 * defined in cb.

 *

 * If multiple clients register the same performance domain, all but the first

 * registration will be ignored.

 *

 * Return 0 on success

 */

int em_register_perf_domain(cpumask_t *span, unsigned int nr_states,

						struct em_data_callback *cb)

{

	struct device *cpu_dev;



	cpu_dev = get_cpu_device(cpumask_first(span));



	return em_dev_register_perf_domain(cpu_dev, nr_states, cb, span);

}

EXPORT_SYMBOL_GPL(em_register_perf_domain);



/**

 * em_dev_unregister_perf_domain() - Unregister Energy Model (EM) for a device

 * @dev		: Device for which the EM is registered

CRA Git | Maintained and supported by SUSTech CRA and CCSE