[PATCH 2/4] ARM: mmp: move function declaration to head file

Haojian Zhuang haojian.zhuang at gmail.com
Sat Apr 13 08:59:13 EDT 2013


On Thu, Apr 11, 2013 at 11:37 AM, Neil Zhang <zhangwm at marvell.com> wrote:
> Move some of the function declaration to head file.
>
> Signed-off-by: Neil Zhang <zhangwm at marvell.com>
> Signed-off-by: Chao Xie <chao.xie at marvell.com>
> ---
>  arch/arm/mach-mmp/common.h  |    3 +++
>  arch/arm/mach-mmp/mmp-dt.c  |    3 ---
>  arch/arm/mach-mmp/mmp2-dt.c |    3 ---
>  3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h
> index 0bdc50b..8c9b510 100644
> --- a/arch/arm/mach-mmp/common.h
> +++ b/arch/arm/mach-mmp/common.h
> @@ -8,3 +8,6 @@ extern void mmp_restart(char, const char *);
>  extern void __init pxa168_clk_init(void);
>  extern void __init pxa910_clk_init(void);
>  extern void __init mmp2_clk_init(void);
> +
> +extern void __init mmp_dt_irq_init(void);
> +extern void __init mmp_dt_init_timer(void);

It's better to make use of of_irq_init() & CLOCKSOURCE_OF_DECLARE()
for timer. So I'll move mmp timer into clocksource & mmp irq into
irqchip directory in the next week. You can rebase your code. Is it OK?

> diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
> index d063efa..af0bb5b 100644
> --- a/arch/arm/mach-mmp/mmp-dt.c
> +++ b/arch/arm/mach-mmp/mmp-dt.c
> @@ -19,9 +19,6 @@
>
>  #include "common.h"
>
> -extern void __init mmp_dt_irq_init(void);
> -extern void __init mmp_dt_init_timer(void);
> -
>  static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {
>         OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),
>         OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),
> diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c
> index fad431a..4ba1fbe 100644
> --- a/arch/arm/mach-mmp/mmp2-dt.c
> +++ b/arch/arm/mach-mmp/mmp2-dt.c
> @@ -21,9 +21,6 @@
>
>  #include "common.h"
>
> -extern void __init mmp_dt_irq_init(void);
> -extern void __init mmp_dt_init_timer(void);
> -
>  static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = {
>         OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", NULL),
>         OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", NULL),
> --
> 1.7.4.1
>



More information about the linux-arm-kernel mailing list