Skip to contentSkip to conversation

clocksource: mxs_timer: Add semicolon at end of line

PATCH In review Fabio Estevam 3 participants 4 messages Apr 2, 2013 – Apr 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clocksource: mxs_timer: Add semicolon at end of line

Fix the following build error:

drivers/clocksource/mxs_timer.c:304:1: error: expected ',' or ';' at end of input

---
 drivers/clocksource/mxs_timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/mxs_timer.c +1 -1
index a4d469b..02af420 100644
@@ -301,4 +301,4 @@ static void __init mxs_timer_init(struct device_node *np)
 	irq = irq_of_parse_and_map(np, 0);
 	setup_irq(irq, &mxs_timer_irq);
 }
-CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init)
+CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init);
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 4 lines · Fabio Estevam

Fix the following build error:

drivers/clocksource/mxs_timer.c:304:1: error: expected ',' or ';' at end of input

What's your gcc version? I'm using gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5), and do not see the compile error.

Anyway, patch applied.

Quoted 10 lines
---
 drivers/clocksource/mxs_timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/mxs_timer.c +0 -0
index a4d469b..02af420 100644

drivers/clocksource/mxs_timer.c static void __init mxs_timer_init(struct device_node *np) · line 304

Quoted 5 lines
drivers/clocksource/mxs_timer.c +1 -1
@@ -301,4 +301,4 @@ static void __init mxs_timer_init(struct device_node *np)
 	irq = irq_of_parse_and_map(np, 0);
 	setup_irq(irq, &mxs_timer_irq);
 }
-CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init)
+CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init);

I guess I took the bad example from drivers/clocksource/vt8500_timer.c.

Shawn

#2 lore raw
Quoted 7 lines · Shawn Guo
Quoted 4 lines · Fabio Estevam

Fix the following build error:

drivers/clocksource/mxs_timer.c:304:1: error: expected ',' or ';' at end of input

What's your gcc version? I'm using gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5), and do not see the compile error.

Ok, I'm seeing the error now on linux-next. It's not about compiler but the commit 3d5a965 (clocksource: make CLOCKSOURCE_OF_DECLARE type safe), which removes the semicolon at end of the CLOCKSOURCE_OF_DECLARE definition.

Shawn

reviewer
#3 lore raw
Quoted 4 lines · Shawn Guo

Ok, I'm seeing the error now on linux-next. It's not about compiler but the commit 3d5a965 (clocksource: make CLOCKSOURCE_OF_DECLARE type safe), which removes the semicolon at end of the CLOCKSOURCE_OF_DECLARE definition.

Right, the removal of the semicolon at the end of CLOCKSOURCE_OF_DECLARE definition is intentional in commit 3d5a965.