[PATCH 26/35] ARM: tegra: Use explicit broadcast oneshot control function

From: Peter Zijlstra
Date: Mon Feb 16 2015 - 08:16:08 EST


From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

Replace the clockevents_notify() call with an explicit function call.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
---
arch/arm/mach-tegra/cpuidle-tegra114.c | 6 +++---
arch/arm/mach-tegra/cpuidle-tegra20.c | 10 +++++-----
arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)

Index: linux/arch/arm/mach-tegra/cpuidle-tegra114.c
===================================================================
--- linux.orig/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ linux/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -15,7 +15,7 @@
*/

#include <asm/firmware.h>
-#include <linux/clockchips.h>
+#include <linux/tick.h>
#include <linux/cpuidle.h>
#include <linux/cpu_pm.h>
#include <linux/kernel.h>
@@ -44,7 +44,7 @@ static int tegra114_idle_power_down(stru
tegra_set_cpu_in_lp2();
cpu_pm_enter();

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+ tick_broadcast_enter();

call_firmware_op(prepare_idle);

@@ -52,7 +52,7 @@ static int tegra114_idle_power_down(stru
if (call_firmware_op(do_idle, 0) == -ENOSYS)
cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+ tick_broadcast_exit();

cpu_pm_exit();
tegra_clear_cpu_in_lp2();
Index: linux/arch/arm/mach-tegra/cpuidle-tegra20.c
===================================================================
--- linux.orig/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ linux/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -20,7 +20,7 @@
*/

#include <linux/clk/tegra.h>
-#include <linux/clockchips.h>
+#include <linux/tick.h>
#include <linux/cpuidle.h>
#include <linux/cpu_pm.h>
#include <linux/kernel.h>
@@ -136,11 +136,11 @@ static bool tegra20_cpu_cluster_power_do
if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready())
return false;

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+ tick_broadcast_enter();

tegra_idle_lp2_last();

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+ tick_broadcast_exit();

if (cpu_online(1))
tegra20_wake_cpu1_from_reset();
@@ -153,13 +153,13 @@ static bool tegra20_idle_enter_lp2_cpu_1
struct cpuidle_driver *drv,
int index)
{
- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+ tick_broadcast_enter();

cpu_suspend(0, tegra20_sleep_cpu_secondary_finish);

tegra20_cpu_clear_resettable();

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+ tick_broadcast_exit();

return true;
}
Index: linux/arch/arm/mach-tegra/cpuidle-tegra30.c
===================================================================
--- linux.orig/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ linux/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -20,7 +20,7 @@
*/

#include <linux/clk/tegra.h>
-#include <linux/clockchips.h>
+#include <linux/tick.h>
#include <linux/cpuidle.h>
#include <linux/cpu_pm.h>
#include <linux/kernel.h>
@@ -76,11 +76,11 @@ static bool tegra30_cpu_cluster_power_do
return false;
}

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+ tick_broadcast_enter();

tegra_idle_lp2_last();

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+ tick_broadcast_exit();

return true;
}
@@ -90,13 +90,13 @@ static bool tegra30_cpu_core_power_down(
struct cpuidle_driver *drv,
int index)
{
- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+ tick_broadcast_enter();

smp_wmb();

cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);

- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+ tick_broadcast_exit();

return true;
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/