Re: [PATCH 13/35] MIPS: jz4740: Cleanup files effected by firmware changes.

[Lars-Peter Clausen <lars@metafoo.de>]

On 06/05/2012 11:19 PM, Steven J. Hill wrote:
> From: "Steven J. Hill" <sjhill@mips.com>
> 
> Make headers consistent across the files and make changes based on
> running the checkpatch script.

Why is the cleanup not in the inital patch?

> 
> Signed-off-by: Steven J. Hill <sjhill@mips.com>
> ---
>  arch/mips/jz4740/prom.c |   25 +++++++++----------------
>  1 file changed, 9 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/mips/jz4740/prom.c b/arch/mips/jz4740/prom.c
> index c5071ab..ea86605 100644
> --- a/arch/mips/jz4740/prom.c
> +++ b/arch/mips/jz4740/prom.c
> @@ -1,23 +1,14 @@
>  /*
> - *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
> - *  JZ4740 SoC prom code
> + * This file is subject to the terms and conditions of the GNU General Public
> + * License.  See the file "COPYING" in the main directory of this archive
> + * for more details.
>   *
> - *  This program is free software; you can redistribute it and/or modify it
> - *  under  the terms of the GNU General  Public License as published by the
> - *  Free Software Foundation;  either version 2 of the License, or (at your
> - *  option) any later version.
> - *
> - *  You should have received a copy of the GNU General Public License along
> - *  with this program; if not, write to the Free Software Foundation, Inc.,
> - *  675 Mass Ave, Cambridge, MA 02139, USA.
> + *  JZ4740 SoC prom code
>   *
> + *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
> + *  Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
>   */

Please don't randomly change the license of files.

> -
>  #include <linux/module.h>
> -#include <linux/kernel.h>
> -#include <linux/init.h>
> -#include <linux/string.h>
> -

Why can't this be in the previous patch which removed the custom fw args parser?

>  #include <linux/serial_reg.h>
>  
>  #include <asm/fw/fw.h>
> @@ -33,7 +24,9 @@ void __init prom_free_prom_memory(void)
>  {
>  }
>  
> -#define UART_REG(_reg) ((void __iomem *)CKSEG1ADDR(JZ4740_UART0_BASE_ADDR + (_reg << 2)))
> +#define UART_REG(_reg)							\
> +	((volatile void __iomem *)CKSEG1ADDR(JZ4740_UART0_BASE_ADDR +	\
> +	(_reg << 2)))
>  

Why did you add volatile here?

>  void prom_putchar(char c)
>  {