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

Commit 4c1ed5a6 authored by Xunlei Pang's avatar Xunlei Pang Committed by Rafael J. Wysocki
Browse files

cpuidle/coupled: Remove redundant 'dev' argument of cpuidle_state_is_coupled() 



For cpuidle_state_is_coupled(), 'dev' is not used, so remove it.

Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ba6a860d

drivers/cpuidle/coupled.c

+1 −3
Original line number Diff line number Diff line
@@ -176,14 +176,12 @@ void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a) 


/**

 * cpuidle_state_is_coupled - check if a state is part of a coupled set

 * @dev: struct cpuidle_device for the current cpu

 * @drv: struct cpuidle_driver for the platform

 * @state: index of the target state in drv->states

 *

 * Returns true if the target state is coupled with cpus besides this one

 */

bool cpuidle_state_is_coupled(struct cpuidle_device *dev,

	struct cpuidle_driver *drv, int state)

bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state)

{

	return drv->states[state].flags & CPUIDLE_FLAG_COUPLED;

}

drivers/cpuidle/cpuidle.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, 
		tick_broadcast_exit();

	}



	if (!cpuidle_state_is_coupled(dev, drv, entered_state))

	if (!cpuidle_state_is_coupled(drv, entered_state))

		local_irq_enable();



	diff = ktime_to_us(ktime_sub(time_end, time_start));
@@ -259,7 +259,7 @@ int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev,

		  int index)

{

	if (cpuidle_state_is_coupled(dev, drv, index))

	if (cpuidle_state_is_coupled(drv, index))

		return cpuidle_enter_state_coupled(dev, drv, index);

	return cpuidle_enter_state(dev, drv, index);

}

drivers/cpuidle/cpuidle.h

+3 −4
Original line number Diff line number Diff line
@@ -34,15 +34,14 @@ extern int cpuidle_add_sysfs(struct cpuidle_device *dev); 
extern void cpuidle_remove_sysfs(struct cpuidle_device *dev);



#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED

bool cpuidle_state_is_coupled(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int state);

bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state);

int cpuidle_enter_state_coupled(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int next_state);

int cpuidle_coupled_register_device(struct cpuidle_device *dev);

void cpuidle_coupled_unregister_device(struct cpuidle_device *dev);

#else

static inline bool cpuidle_state_is_coupled(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int state)

static inline

bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state)

{

	return false;

}