From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 12/13] ARM: shmobile: Use clocksource_of_init() on r8a7790
Date: Tue, 06 Aug 2013 02:07:07 +0000 [thread overview]
Message-ID: <20130806020705.GC20940@verge.net.au> (raw)
In-Reply-To: <20130806012855.GB20940@verge.net.au>
On Tue, Aug 06, 2013 at 10:28:56AM +0900, Simon Horman wrote:
> On Thu, Aug 01, 2013 at 04:03:00AM +0900, Magnus Damm wrote:
> > From: Magnus Damm <damm@opensource.se>
> >
> > Replace the call to shmobile_timer_init() with
> > clocksource_of_init(). This will allow us to
> > get rid of shmobile_timer_init().
> >
> > Signed-off-by: Magnus Damm <damm@opensource.se>
> > ---
> >
> > arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c
> > +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-08-01 03:17:48.000000000 +0900
> > @@ -263,7 +263,7 @@ void __init r8a7790_timer_init(void)
> > iounmap(base);
> > #endif /* CONFIG_ARM_ARCH_TIMER */
> >
> > - shmobile_timer_init();
> > + clocksource_of_init();
> > }
> >
> > void __init r8a7790_init_delay(void)
>
> I seem to need the following:
>
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
> index 7301255..d0f5c9f 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -18,6 +18,7 @@
> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
>
> +#include <linux/clocksource.h>
> #include <linux/irq.h>
> #include <linux/kernel.h>
> #include <linux/of_platform.h>
>
>
> To avoid:
>
> ...
> CC arch/arm/mach-shmobile/setup-r8a7790.o
> arch/arm/mach-shmobile/setup-r8a7790.c: In function ‘r8a7790_timer_init’:
> arch/arm/mach-shmobile/setup-r8a7790.c:266:2: error: implicit declaration of function ‘clocksource_of_init’ [-Werror=implicit-function-declaration]
> cc1: some warnings being treated as errors
> make[1]: *** [arch/arm/mach-shmobile/setup-r8a7790.o] Error 1
As discussed off-line, I have squashed the above change into your patch.
The result, which I plan to push shortly, is as follows:
From: Magnus Damm <damm@opensource.se>
ARM: shmobile: Use clocksource_of_init() on r8a7790
Replace the call to shmobile_timer_init() with
clocksource_of_init(). This will allow us to
get rid of shmobile_timer_init().
Signed-off-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: include linux/clocksource.h]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7790.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 86cf507..6d4aa04 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <linux/clocksource.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
@@ -263,7 +264,7 @@ void __init r8a7790_timer_init(void)
iounmap(base);
#endif /* CONFIG_ARM_ARCH_TIMER */
- shmobile_timer_init();
+ clocksource_of_init();
}
void __init r8a7790_init_delay(void)
--
1.8.3.2
next prev parent reply other threads:[~2013-08-06 2:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 19:01 [PATCH 00/13] ARM: shmobile: Rework ->init_time() / shmobile_timer_init() Magnus Damm
2013-07-31 19:01 ` [PATCH 01/13] ARM: shmobile: Use default ->init_time() on r8a73a4 Magnus Damm
2013-07-31 19:01 ` [PATCH 02/13] ARM: shmobile: Use default ->init_time() on r8a7740 Magnus Damm
2013-07-31 19:01 ` [PATCH 03/13] ARM: shmobile: Use default ->init_time() on r8a7778 Magnus Damm
2013-07-31 19:01 ` [PATCH 04/13] ARM: shmobile: Use default ->init_time() on r8a7779 Magnus Damm
2013-07-31 19:01 ` [PATCH 05/13] ARM: shmobile: Use default ->init_time() on Bockw Magnus Damm
2013-07-31 19:02 ` [PATCH 06/13] ARM: shmobile: Use default ->init_time() on Bockw DT ref Magnus Damm
2013-07-31 19:02 ` [PATCH 07/13] ARM: shmobile: Use default ->init_time() on Armadillo " Magnus Damm
2013-07-31 19:02 ` [PATCH 08/13] ARM: shmobile: Use default ->init_time() on APE6EVM Magnus Damm
2013-07-31 19:02 ` [PATCH 09/13] ARM: shmobile: Use default ->init_time() on APE6EVM DT ref Magnus Damm
2013-07-31 19:02 ` [PATCH 10/13] ARM: shmobile: Use default ->init_time() on Marzen " Magnus Damm
2013-07-31 19:02 ` [PATCH 11/13] ARM: shmobile: Use default ->init_time() on KZM9G " Magnus Damm
2013-07-31 19:03 ` [PATCH 12/13] ARM: shmobile: Use clocksource_of_init() on r8a7790 Magnus Damm
2013-08-06 1:28 ` Simon Horman
2013-08-06 2:07 ` Simon Horman [this message]
2013-07-31 19:03 ` [PATCH 13/13] ARM: shmobile: Remove unused shmobile_init_time() Magnus Damm
2013-08-01 0:55 ` [PATCH 00/13] ARM: shmobile: Rework ->init_time() / shmobile_timer_init() Kuninori Morimoto
2013-08-05 8:50 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130806020705.GC20940@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).