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

Commit 4d82d058 authored by Joseph Lo's avatar Joseph Lo Committed by Stephen Warren
Browse files

ARM: tegra: cpuidle: remove redundant parameters for powered-down mode 



After the patch series for system suspending support, tegra_idle_lp2_last()
no longer uses its parameters cpu_on_time or cpu_off_time, so remove them.

Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent c8c2e606

arch/arm/mach-tegra/cpuidle-tegra20.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -130,10 +130,6 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, 
					   struct cpuidle_driver *drv,

					   struct cpuidle_driver *drv,

					   int index)

					   int index)

{

{

	struct cpuidle_state *state = &drv->states[index];

	u32 cpu_on_time = state->exit_latency;

	u32 cpu_off_time = state->target_residency - state->exit_latency;



	while (tegra20_cpu_is_resettable_soon())

	while (tegra20_cpu_is_resettable_soon())

		cpu_relax();

		cpu_relax();
@@ -142,7 +138,7 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, 




	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);

	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);





	tegra_idle_lp2_last(cpu_on_time, cpu_off_time);

	tegra_idle_lp2_last();





	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);

	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);

arch/arm/mach-tegra/cpuidle-tegra30.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -72,10 +72,6 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, 
					   struct cpuidle_driver *drv,

					   struct cpuidle_driver *drv,

					   int index)

					   int index)

{

{

	struct cpuidle_state *state = &drv->states[index];

	u32 cpu_on_time = state->exit_latency;

	u32 cpu_off_time = state->target_residency - state->exit_latency;



	/* All CPUs entering LP2 is not working.

	/* All CPUs entering LP2 is not working.

	 * Don't let CPU0 enter LP2 when any secondary CPU is online.

	 * Don't let CPU0 enter LP2 when any secondary CPU is online.

	 */

	 */
@@ -86,7 +82,7 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, 




	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);

	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);





	tegra_idle_lp2_last(cpu_on_time, cpu_off_time);

	tegra_idle_lp2_last();





	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);

	clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);

arch/arm/mach-tegra/pm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ static int tegra_sleep_cpu(unsigned long v2p) 
	return 0;

	return 0;

}

}





void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time)

void tegra_idle_lp2_last(void)

{

{

	tegra_pmc_pm_set(TEGRA_SUSPEND_LP2);

	tegra_pmc_pm_set(TEGRA_SUSPEND_LP2);

arch/arm/mach-tegra/pm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ void restore_cpu_arch_register(void); 
void tegra_clear_cpu_in_lp2(int phy_cpu_id);

void tegra_clear_cpu_in_lp2(int phy_cpu_id);

bool tegra_set_cpu_in_lp2(int phy_cpu_id);

bool tegra_set_cpu_in_lp2(int phy_cpu_id);





void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time);

void tegra_idle_lp2_last(void);

extern void (*tegra_tear_down_cpu)(void);

extern void (*tegra_tear_down_cpu)(void);





#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP