diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-02 20:32:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-03 02:44:35 -0400 |
commit | a0b4122447a3c1a467ce4e4f1bb863e1170394d5 (patch) | |
tree | 397a47ea6ddb4e0d0edbad86b241988da11a33b0 | |
parent | fb7f0398a98020def9429ddd7b4a8fc2d948b092 (diff) |
ARM: Tegra: Use explicit broadcast oneshot control function
Replace the clockevents_notify() call with an explicit function call.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Link: http://lkml.kernel.org/r/2131111.rjxRLX1eZB@vostro.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra114.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra20.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra30.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index f2b586d7b15d..155807fa6fdd 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <asm/firmware.h> | 17 | #include <asm/firmware.h> |
18 | #include <linux/clockchips.h> | 18 | #include <linux/tick.h> |
19 | #include <linux/cpuidle.h> | 19 | #include <linux/cpuidle.h> |
20 | #include <linux/cpu_pm.h> | 20 | #include <linux/cpu_pm.h> |
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
@@ -44,7 +44,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, | |||
44 | tegra_set_cpu_in_lp2(); | 44 | tegra_set_cpu_in_lp2(); |
45 | cpu_pm_enter(); | 45 | cpu_pm_enter(); |
46 | 46 | ||
47 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); | 47 | tick_broadcast_enter(); |
48 | 48 | ||
49 | call_firmware_op(prepare_idle); | 49 | call_firmware_op(prepare_idle); |
50 | 50 | ||
@@ -52,7 +52,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, | |||
52 | if (call_firmware_op(do_idle, 0) == -ENOSYS) | 52 | if (call_firmware_op(do_idle, 0) == -ENOSYS) |
53 | cpu_suspend(0, tegra30_sleep_cpu_secondary_finish); | 53 | cpu_suspend(0, tegra30_sleep_cpu_secondary_finish); |
54 | 54 | ||
55 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 55 | tick_broadcast_exit(); |
56 | 56 | ||
57 | cpu_pm_exit(); | 57 | cpu_pm_exit(); |
58 | tegra_clear_cpu_in_lp2(); | 58 | tegra_clear_cpu_in_lp2(); |
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c index 4f25a7c7ca0f..48844ae6c3a1 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/clk/tegra.h> | 22 | #include <linux/clk/tegra.h> |
23 | #include <linux/clockchips.h> | 23 | #include <linux/tick.h> |
24 | #include <linux/cpuidle.h> | 24 | #include <linux/cpuidle.h> |
25 | #include <linux/cpu_pm.h> | 25 | #include <linux/cpu_pm.h> |
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
@@ -136,11 +136,11 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, | |||
136 | if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready()) | 136 | if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready()) |
137 | return false; | 137 | return false; |
138 | 138 | ||
139 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); | 139 | tick_broadcast_enter(); |
140 | 140 | ||
141 | tegra_idle_lp2_last(); | 141 | tegra_idle_lp2_last(); |
142 | 142 | ||
143 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 143 | tick_broadcast_exit(); |
144 | 144 | ||
145 | if (cpu_online(1)) | 145 | if (cpu_online(1)) |
146 | tegra20_wake_cpu1_from_reset(); | 146 | tegra20_wake_cpu1_from_reset(); |
@@ -153,13 +153,13 @@ static bool tegra20_idle_enter_lp2_cpu_1(struct cpuidle_device *dev, | |||
153 | struct cpuidle_driver *drv, | 153 | struct cpuidle_driver *drv, |
154 | int index) | 154 | int index) |
155 | { | 155 | { |
156 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); | 156 | tick_broadcast_enter(); |
157 | 157 | ||
158 | cpu_suspend(0, tegra20_sleep_cpu_secondary_finish); | 158 | cpu_suspend(0, tegra20_sleep_cpu_secondary_finish); |
159 | 159 | ||
160 | tegra20_cpu_clear_resettable(); | 160 | tegra20_cpu_clear_resettable(); |
161 | 161 | ||
162 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 162 | tick_broadcast_exit(); |
163 | 163 | ||
164 | return true; | 164 | return true; |
165 | } | 165 | } |
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c index f8815ed65d9d..84d809a3cba3 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/arch/arm/mach-tegra/cpuidle-tegra30.c | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/clk/tegra.h> | 22 | #include <linux/clk/tegra.h> |
23 | #include <linux/clockchips.h> | 23 | #include <linux/tick.h> |
24 | #include <linux/cpuidle.h> | 24 | #include <linux/cpuidle.h> |
25 | #include <linux/cpu_pm.h> | 25 | #include <linux/cpu_pm.h> |
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
@@ -76,11 +76,11 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, | |||
76 | return false; | 76 | return false; |
77 | } | 77 | } |
78 | 78 | ||
79 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); | 79 | tick_broadcast_enter(); |
80 | 80 | ||
81 | tegra_idle_lp2_last(); | 81 | tegra_idle_lp2_last(); |
82 | 82 | ||
83 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 83 | tick_broadcast_exit(); |
84 | 84 | ||
85 | return true; | 85 | return true; |
86 | } | 86 | } |
@@ -90,13 +90,13 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev, | |||
90 | struct cpuidle_driver *drv, | 90 | struct cpuidle_driver *drv, |
91 | int index) | 91 | int index) |
92 | { | 92 | { |
93 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); | 93 | tick_broadcast_enter(); |
94 | 94 | ||
95 | smp_wmb(); | 95 | smp_wmb(); |
96 | 96 | ||
97 | cpu_suspend(0, tegra30_sleep_cpu_secondary_finish); | 97 | cpu_suspend(0, tegra30_sleep_cpu_secondary_finish); |
98 | 98 | ||
99 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 99 | tick_broadcast_exit(); |
100 | 100 | ||
101 | return true; | 101 | return true; |
102 | } | 102 | } |