aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-06-06 17:38:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:18 -0400
commit835eeeed73718b226318c82f7c636e1baff4f118 (patch)
tree9b43bf8810e4f395ab03f02bc195ac223c4c7350 /arch/cris
parentae022622ae9447bd70e59db7c91efa25c99a90d5 (diff)
cris: update comments for generic idle conversion
As of commit 8dc7c5ecd8d0 ("cris: Use generic idle loop"), cris no longer provides cpu_idle(). - On cris-v10, etrax_gpio_wake_up_check() is called from default_idle() instead of cpu_idle(), - On cris-v32, etrax_gpio_wake_up_check() is not called from default_idle(), so remove this (copy-and-paste?) part. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/drivers/gpio.c4
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/gpio.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index f4374bae4fb4..64285e0d3481 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -833,8 +833,8 @@ static int __init gpio_init(void)
833 printk(KERN_INFO "ETRAX 100LX GPIO driver v2.5, (c) 2001-2008 " 833 printk(KERN_INFO "ETRAX 100LX GPIO driver v2.5, (c) 2001-2008 "
834 "Axis Communications AB\n"); 834 "Axis Communications AB\n");
835 /* We call etrax_gpio_wake_up_check() from timer interrupt and 835 /* We call etrax_gpio_wake_up_check() from timer interrupt and
836 * from cpu_idle() in kernel/process.c 836 * from default_idle() in kernel/process.c
837 * The check in cpu_idle() reduces latency from ~15 ms to ~6 ms 837 * The check in default_idle() reduces latency from ~15 ms to ~6 ms
838 * in some tests. 838 * in some tests.
839 */ 839 */
840 res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt, 840 res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,
diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
index 9e54273af0ca..009f4ee1bd09 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c
@@ -958,11 +958,7 @@ gpio_init(void)
958 958
959 printk(KERN_INFO "ETRAX FS GPIO driver v2.5, (c) 2003-2007 " 959 printk(KERN_INFO "ETRAX FS GPIO driver v2.5, (c) 2003-2007 "
960 "Axis Communications AB\n"); 960 "Axis Communications AB\n");
961 /* We call etrax_gpio_wake_up_check() from timer interrupt and 961 /* We call etrax_gpio_wake_up_check() from timer interrupt */
962 * from cpu_idle() in kernel/process.c
963 * The check in cpu_idle() reduces latency from ~15 ms to ~6 ms
964 * in some tests.
965 */
966 if (request_irq(TIMER0_INTR_VECT, gpio_poll_timer_interrupt, 962 if (request_irq(TIMER0_INTR_VECT, gpio_poll_timer_interrupt,
967 IRQF_SHARED, "gpio poll", &alarmlist)) 963 IRQF_SHARED, "gpio poll", &alarmlist))
968 printk(KERN_ERR "timer0 irq for gpio\n"); 964 printk(KERN_ERR "timer0 irq for gpio\n");