[prev in list] [next in list] [prev in thread] [next in thread] 

List:       microblaze-uclinux
Subject:    Re: [microblaze-linux] [PATCH 1/2] microblaze: Rename global function heartbeat()
From:       Michal Simek <monstr () monstr ! eu>
Date:       2014-02-18 6:17:49
Message-ID: 5302FB0D.7050608 () monstr ! eu
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On 02/17/2014 06:44 PM, Guenter Roeck wrote:
> microblaze:allmodconfig complains for some configurations that 'heartbeat' is
> redefined as different kind of symbol. This is seen in test compiles of watchdog
> drivers, which often use 'heartbeat' as ststic variable.
> 
> Since 'heartbeat' is an unfortunate name for a global function, rename it to
> xilinx_heartbeat, following the naming convention of other global functions
> in timer.c. Also rename the setup function to xilinx_setup_heartbeat.
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  arch/microblaze/include/asm/setup.h |    4 ++--
>  arch/microblaze/kernel/heartbeat.c  |    4 ++--
>  arch/microblaze/kernel/timer.c      |    4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
> index f05df56..b71ed1e 100644
> --- a/arch/microblaze/include/asm/setup.h
> +++ b/arch/microblaze/include/asm/setup.h
> @@ -25,8 +25,8 @@ int setup_early_printk(char *opt);
>  void remap_early_printk(void);
>  void disable_early_printk(void);
>  
> -void heartbeat(void);
> -void setup_heartbeat(void);
> +void xilinx_heartbeat(void);
> +void xilinx_setup_heartbeat(void);

We use xilinx_ prefix for drivers and this is architecture
change. It means it is much better to use microblaze_ prefix.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



["signature.asc" (application/pgp-signature)]

_______________________________________________
microblaze-linux mailing list
microblaze-linux@lists.itee.uq.edu.au
https://lists.eait.uq.edu.au/mailman/listinfo/microblaze-linux


[prev in list] [next in list] [prev in thread] [next in thread]