[PATCH] clocksource: sirf: Remove unused variable

[PATCH] clocksource: sirf: Remove unused variable

[Thierry Reding]

From: Thierry Reding <treding@nvidia.com>

Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate")
removes all uses of the timer_div variable. Since the variable is no
longer used it should be removed.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/clocksource/timer-marco.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index 361a789d4bee..3ddb81f7ee66 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -257,7 +257,6 @@ static void __init sirfsoc_clockevent_init(void)
 /* initialize the kernel jiffy timer source */
 static void __init sirfsoc_marco_timer_init(struct device_node *np)
 {
-	u32 timer_div;
 	struct clk *clk;
 
 	clk = of_clk_get(np, 0);
-- 
2.1.3

[PATCH] clocksource: sirf: Remove unused variable

[Daniel Lezcano]

On 12/15/2014 04:59 PM, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate")
> removes all uses of the timer_div variable. Since the variable is no
> longer used it should be removed.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---

Applied to my tree. Thanks!

   -- Daniel

-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH] clocksource: sirf: Remove unused variable

[Barry Song]

2014-12-16 0:17 GMT+08:00 Daniel Lezcano <daniel.lezcano@linaro.org>:
> On 12/15/2014 04:59 PM, Thierry Reding wrote:
>>
>> From: Thierry Reding <treding@nvidia.com>
>>
>> Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate")
>> removes all uses of the timer_div variable. Since the variable is no
>> longer used it should be removed.
>>
>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>> ---
>
>
> Applied to my tree. Thanks!

Daniel,

i didn't find this commit in any tree in kernel.org. am i missing something?

so i manually rebased "clocksource: marco: rename marco to atlas7"
against this commit.

can you help to apply the attached patch to your tree? i guess pulling
by arm-soc will cause conflicts.


>
>   -- Daniel
>

-barry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-clocksource-marco-rename-marco-to-atlas7.patch
Type: text/x-patch
Size: 20190 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150111/d2680e92/attachment-0001.bin>

[PATCH] clocksource: sirf: Remove unused variable

[Daniel Lezcano]

On 01/11/2015 04:58 PM, Barry Song wrote:
> 2014-12-16 0:17 GMT+08:00 Daniel Lezcano <daniel.lezcano@linaro.org>:
>> On 12/15/2014 04:59 PM, Thierry Reding wrote:
>>>
>>> From: Thierry Reding <treding@nvidia.com>
>>>
>>> Commit ef89af1f4380 ("clocksource: sirf: Remove hard-coded clock rate")
>>> removes all uses of the timer_div variable. Since the variable is no
>>> longer used it should be removed.
>>>
>>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>>> ---
>>
>>
>> Applied to my tree. Thanks!
>
> Daniel,
>
> i didn't find this commit in any tree in kernel.org. am i missing something?

Nope, I did probably something wrong.

> so i manually rebased "clocksource: marco: rename marco to atlas7"
> against this commit.
>
> can you help to apply the attached patch to your tree? i guess pulling
> by arm-soc will cause conflicts.

Ok, done. Both patches are in my tree [1].

Thanks
   -- Daniel

[1] 
https://git.linaro.org/people/daniel.lezcano/linux.git/shortlog/refs/heads/clockevents/3.20


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH] clocksource: sirf: remove unused variable

[Arnd Bergmann]

A recent rework of the driver left an obviously unused variable
around, and now the compiler complains:

clocksource/timer-marco.c: In function 'sirfsoc_marco_timer_init':
clocksource/timer-marco.c:260:6: warning: unused variable 'timer_div' [-Wunused-variable]

Remove it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ef89af1f4380b92 ("clocksource: sirf: Remove hard-coded clock rate")

diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index 361a789d4bee..3ddb81f7ee66 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -257,7 +257,6 @@ static void __init sirfsoc_clockevent_init(void)
 /* initialize the kernel jiffy timer source */
 static void __init sirfsoc_marco_timer_init(struct device_node *np)
 {
-	u32 timer_div;
 	struct clk *clk;
 
 	clk = of_clk_get(np, 0);

[PATCH] clocksource: sirf: remove unused variable

[Daniel Lezcano]

On 01/13/2015 03:22 PM, Arnd Bergmann wrote:
> A recent rework of the driver left an obviously unused variable
> around, and now the compiler complains:
>
> clocksource/timer-marco.c: In function 'sirfsoc_marco_timer_init':
> clocksource/timer-marco.c:260:6: warning: unused variable 'timer_div' [-Wunused-variable]
>
> Remove it.

Hi Arnd,

thanks for the fix. But this has been already fixed and merged in my 
tree [1].

   -- Daniel

[1] 
https://git.linaro.org/people/daniel.lezcano/linux.git/commitdiff/2a016d694f36fc31f7f9fede902346c5895702bb?hp=89de77a8c557f14d2713a1f43fbc33980e639b98

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: ef89af1f4380b92 ("clocksource: sirf: Remove hard-coded clock rate")
>
> diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
> index 361a789d4bee..3ddb81f7ee66 100644
> --- a/drivers/clocksource/timer-marco.c
> +++ b/drivers/clocksource/timer-marco.c
> @@ -257,7 +257,6 @@ static void __init sirfsoc_clockevent_init(void)
>   /* initialize the kernel jiffy timer source */
>   static void __init sirfsoc_marco_timer_init(struct device_node *np)
>   {
> -	u32 timer_div;
>   	struct clk *clk;
>
>   	clk = of_clk_get(np, 0);
>


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH] clocksource: sirf: remove unused variable

[Arnd Bergmann]

On Tuesday 13 January 2015 15:27:05 Daniel Lezcano wrote:
> On 01/13/2015 03:22 PM, Arnd Bergmann wrote:
> > A recent rework of the driver left an obviously unused variable
> > around, and now the compiler complains:
> >
> > clocksource/timer-marco.c: In function 'sirfsoc_marco_timer_init':
> > clocksource/timer-marco.c:260:6: warning: unused variable 'timer_div' [-Wunused-variable]
> >
> > Remove it.
> 
> Hi Arnd,
> 
> thanks for the fix. But this has been already fixed and merged in my 
> tree [1].

Ok, thanks. For some reason it has not shown up in Linux-next yet.
Is this branch supposed to be part of -next?

	Arnd

[PATCH] clocksource: sirf: remove unused variable

[Barry Song]

2015-01-13 22:27 GMT+08:00 Daniel Lezcano <daniel.lezcano@linaro.org>:
> On 01/13/2015 03:22 PM, Arnd Bergmann wrote:
>>
>> A recent rework of the driver left an obviously unused variable
>> around, and now the compiler complains:
>>
>> clocksource/timer-marco.c: In function 'sirfsoc_marco_timer_init':
>> clocksource/timer-marco.c:260:6: warning: unused variable 'timer_div'
>> [-Wunused-variable]
>>
>> Remove it.
>
>
> Hi Arnd,
>
> thanks for the fix. But this has been already fixed and merged in my tree
> [1].
>
>   -- Daniel
>
> [1]
> https://git.linaro.org/people/daniel.lezcano/linux.git/commitdiff/2a016d694f36fc31f7f9fede902346c5895702bb?hp=89de77a8c557f14d2713a1f43fbc33980e639b98
>

yes, arnd. i also asked Daniel to apply "clocksource: marco: Rename
marco to atlas7" rebased on this fix here:
https://git.linaro.org/people/daniel.lezcano/linux.git/commit/81428bbe1d8a073bb3741678ef1d3c1016119c77

so this one is excluded from my pull request for atlas7. a
pull-request from arm-soc might cause merge conflicts?

>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Fixes: ef89af1f4380b92 ("clocksource: sirf: Remove hard-coded clock rate")

-barry

[PATCH] clocksource: sirf: remove unused variable

[Daniel Lezcano]

On 01/13/2015 04:24 PM, Arnd Bergmann wrote:
> On Tuesday 13 January 2015 15:27:05 Daniel Lezcano wrote:
>> On 01/13/2015 03:22 PM, Arnd Bergmann wrote:
>>> A recent rework of the driver left an obviously unused variable
>>> around, and now the compiler complains:
>>>
>>> clocksource/timer-marco.c: In function 'sirfsoc_marco_timer_init':
>>> clocksource/timer-marco.c:260:6: warning: unused variable 'timer_div' [-Wunused-variable]
>>>
>>> Remove it.
>>
>> Hi Arnd,
>>
>> thanks for the fix. But this has been already fixed and merged in my
>> tree [1].
>
> Ok, thanks. For some reason it has not shown up in Linux-next yet.
> Is this branch supposed to be part of -next?

Yes, I will update my next branch with these changes.

   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH] clocksource: sirf: remove unused variable

[Arnd Bergmann]

On Tuesday 13 January 2015 23:24:24 Barry Song wrote:
> 
> yes, arnd. i also asked Daniel to apply "clocksource: marco: Rename
> marco to atlas7" rebased on this fix here:
> https://git.linaro.org/people/daniel.lezcano/linux.git/commit/81428bbe1d8a073bb3741678ef1d3c1016119c77

Ok
 
> so this one is excluded from my pull request for atlas7. a
> pull-request from arm-soc might cause merge conflicts?

I was just doing build-tests on linux-next today and submitted patches
for each new warning or error I saw. Nothing to worry about as it's already
fixed and I'm dropping my version as soon as the other fix makes it into
next.

	Arnd