2013-04-02 16:32:09

by Fabio Estevam

Subject: [PATCH] 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

Signed-off-by: Fabio Estevam <[email protected]>
---
drivers/clocksource/mxs_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
index a4d469b..02af420 100644
--- a/drivers/clocksource/mxs_timer.c
+++ b/drivers/clocksource/mxs_timer.c
@@ -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);
--
1.7.9.5

2013-04-03 02:29:18

by Shawn Guo

Subject: Re: [PATCH] clocksource: mxs_timer: Add semicolon at end of line

On Tue, Apr 02, 2013 at 01:30:32PM -0300, Fabio Estevam wrote:
> 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.

> Signed-off-by: Fabio Estevam <[email protected]>
> ---
> drivers/clocksource/mxs_timer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
> index a4d469b..02af420 100644
> --- a/drivers/clocksource/mxs_timer.c
> +++ b/drivers/clocksource/mxs_timer.c
> @@ -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

2013-04-03 02:56:12

by Shawn Guo

Subject: Re: [PATCH] clocksource: mxs_timer: Add semicolon at end of line

On 3 April 2013 10:29, Shawn Guo <[email protected]> wrote:
> On Tue, Apr 02, 2013 at 01:30:32PM -0300, Fabio Estevam wrote:
>> 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

2013-04-03 03:17:27

by Fabio Estevam

Subject: Re: [PATCH] clocksource: mxs_timer: Add semicolon at end of line

On Tue, Apr 2, 2013 at 11:56 PM, Shawn Guo <[email protected]> wrote:

> 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.