Commit 1aef40e2 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

cpuidle / sysfs: change function parameter 



The function needs the cpuidle_device which is initially passed to the
caller.

The current code gets the struct device from the struct cpuidle_device,
pass it the cpuidle_add_sysfs function. This function calls
per_cpu(cpuidle_devices, cpu) to get the cpuidle_device.

This patch pass the cpuidle_device instead and simplify the code.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 77b67063

drivers/cpuidle/cpuidle.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -394,7 +394,6 @@ EXPORT_SYMBOL_GPL(cpuidle_disable_device); 
static int __cpuidle_register_device(struct cpuidle_device *dev)

static int __cpuidle_register_device(struct cpuidle_device *dev)

{

{

	int ret;

	int ret;

	struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);

	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();

	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();





	if (!try_module_get(cpuidle_driver->owner))

	if (!try_module_get(cpuidle_driver->owner))
@@ -404,7 +403,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) 




	per_cpu(cpuidle_devices, dev->cpu) = dev;

	per_cpu(cpuidle_devices, dev->cpu) = dev;

	list_add(&dev->device_list, &cpuidle_detected_devices);

	list_add(&dev->device_list, &cpuidle_detected_devices);

	ret = cpuidle_add_sysfs(cpu_dev);

	ret = cpuidle_add_sysfs(dev);

	if (ret)

	if (ret)

		goto err_sysfs;

		goto err_sysfs;
@@ -416,7 +415,7 @@ static int __cpuidle_register_device(struct cpuidle_device *dev) 
	return 0;

	return 0;





err_coupled:

err_coupled:

	cpuidle_remove_sysfs(cpu_dev);

	cpuidle_remove_sysfs(dev);

	wait_for_completion(&dev->kobj_unregister);

	wait_for_completion(&dev->kobj_unregister);

err_sysfs:

err_sysfs:

	list_del(&dev->device_list);

	list_del(&dev->device_list);
@@ -460,7 +459,6 @@ EXPORT_SYMBOL_GPL(cpuidle_register_device); 
 */

 */

void cpuidle_unregister_device(struct cpuidle_device *dev)

void cpuidle_unregister_device(struct cpuidle_device *dev)

{

{

	struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);

	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();

	struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();





	if (dev->registered == 0)

	if (dev->registered == 0)
@@ -470,7 +468,7 @@ void cpuidle_unregister_device(struct cpuidle_device *dev) 




	cpuidle_disable_device(dev);

	cpuidle_disable_device(dev);





	cpuidle_remove_sysfs(cpu_dev);

	cpuidle_remove_sysfs(dev);

	list_del(&dev->device_list);

	list_del(&dev->device_list);

	wait_for_completion(&dev->kobj_unregister);

	wait_for_completion(&dev->kobj_unregister);

	per_cpu(cpuidle_devices, dev->cpu) = NULL;

	per_cpu(cpuidle_devices, dev->cpu) = NULL;

drivers/cpuidle/cpuidle.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ extern int cpuidle_add_interface(struct device *dev); 
extern void cpuidle_remove_interface(struct device *dev);

extern void cpuidle_remove_interface(struct device *dev);

extern int cpuidle_add_state_sysfs(struct cpuidle_device *device);

extern int cpuidle_add_state_sysfs(struct cpuidle_device *device);

extern void cpuidle_remove_state_sysfs(struct cpuidle_device *device);

extern void cpuidle_remove_state_sysfs(struct cpuidle_device *device);

extern int cpuidle_add_sysfs(struct device *dev);

extern int cpuidle_add_sysfs(struct cpuidle_device *dev);

extern void cpuidle_remove_sysfs(struct device *dev);

extern void cpuidle_remove_sysfs(struct cpuidle_device *dev);





#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED

#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED

bool cpuidle_state_is_coupled(struct cpuidle_device *dev,

bool cpuidle_state_is_coupled(struct cpuidle_device *dev,

drivers/cpuidle/sysfs.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -408,13 +408,11 @@ void cpuidle_remove_state_sysfs(struct cpuidle_device *device) 
 * cpuidle_add_sysfs - creates a sysfs instance for the target device

 * cpuidle_add_sysfs - creates a sysfs instance for the target device

 * @dev: the target device

 * @dev: the target device

 */

 */

int cpuidle_add_sysfs(struct device *cpu_dev)

int cpuidle_add_sysfs(struct cpuidle_device *dev)

{

{

	int cpu = cpu_dev->id;

	struct device *cpu_dev = get_cpu_device((unsigned long)dev->cpu);

	struct cpuidle_device *dev;

	int error;

	int error;





	dev = per_cpu(cpuidle_devices, cpu);

	error = kobject_init_and_add(&dev->kobj, &ktype_cpuidle, &cpu_dev->kobj,

	error = kobject_init_and_add(&dev->kobj, &ktype_cpuidle, &cpu_dev->kobj,

				     "cpuidle");

				     "cpuidle");

	if (!error)

	if (!error)
@@ -426,11 +424,7 @@ int cpuidle_add_sysfs(struct device *cpu_dev) 
 * cpuidle_remove_sysfs - deletes a sysfs instance on the target device

 * cpuidle_remove_sysfs - deletes a sysfs instance on the target device

 * @dev: the target device

 * @dev: the target device

 */

 */

void cpuidle_remove_sysfs(struct device *cpu_dev)

void cpuidle_remove_sysfs(struct cpuidle_device *dev)

{

{

	int cpu = cpu_dev->id;

	struct cpuidle_device *dev;



	dev = per_cpu(cpuidle_devices, cpu);

	kobject_put(&dev->kobj);

	kobject_put(&dev->kobj);

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE