Re: [PATCH 1/2] rename pSeries nvram functions

[Benjamin Herrenschmidt <benh@kernel.crashing.org>]

On Wed, 2007-01-24 at 18:16 -0600, Nathan Lynch wrote:
> The nvram support in the pSeries platform code is not really tied to
> the pSeries platform.  This code is useful on other platforms that
> have the necessary firmware support.
> 
> Change the "pSeries" prefixes on the nvram function names to "rtas" in
> preparation for moving this code to a platform-neutral location.
> 
> Signed-off-by: Nathan Lynch <ntl@pobox.com>

Please, move them out of platform/pseries while at it, so you can also
merge with chrp nvram.c which is pretty much the same.

Cheers,
Ben.

> ---
>  arch/powerpc/platforms/pseries/nvram.c |   14 +++++++-------
>  arch/powerpc/platforms/pseries/setup.c |    2 +-
>  include/asm-powerpc/nvram.h            |    2 +-
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
> index 64163ce..45cce8c 100644
> --- a/arch/powerpc/platforms/pseries/nvram.c
> +++ b/arch/powerpc/platforms/pseries/nvram.c
> @@ -29,7 +29,7 @@ static char nvram_buf[NVRW_CNT];	/* assume this is in the first 4GB */
>  static DEFINE_SPINLOCK(nvram_lock);
>  
> 
> -static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
> +static ssize_t rtas_nvram_read(char *buf, size_t count, loff_t *index)
>  {
>  	unsigned int i;
>  	unsigned long len;
> @@ -73,7 +73,7 @@ static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
>  	return p - buf;
>  }
>  
> -static ssize_t pSeries_nvram_write(char *buf, size_t count, loff_t *index)
> +static ssize_t rtas_nvram_write(char *buf, size_t count, loff_t *index)
>  {
>  	unsigned int i;
>  	unsigned long len;
> @@ -115,12 +115,12 @@ static ssize_t pSeries_nvram_write(char *buf, size_t count, loff_t *index)
>  	return p - buf;
>  }
>  
> -static ssize_t pSeries_nvram_get_size(void)
> +static ssize_t rtas_nvram_get_size(void)
>  {
>  	return nvram_size ? nvram_size : -ENODEV;
>  }
>  
> -int __init pSeries_nvram_init(void)
> +int __init rtas_nvram_init(void)
>  {
>  	struct device_node *nvram;
>  	const unsigned int *nbytes_p;
> @@ -141,9 +141,9 @@ int __init pSeries_nvram_init(void)
>  	printk(KERN_INFO "PPC64 nvram contains %d bytes\n", nvram_size);
>  	of_node_put(nvram);
>  
> -	ppc_md.nvram_read	= pSeries_nvram_read;
> -	ppc_md.nvram_write	= pSeries_nvram_write;
> -	ppc_md.nvram_size	= pSeries_nvram_get_size;
> +	ppc_md.nvram_read	= rtas_nvram_read;
> +	ppc_md.nvram_write	= rtas_nvram_write;
> +	ppc_md.nvram_size	= rtas_nvram_get_size;
>  
>  	return 0;
>  }
> diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
> index 042ecae..488828f 100644
> --- a/arch/powerpc/platforms/pseries/setup.c
> +++ b/arch/powerpc/platforms/pseries/setup.c
> @@ -315,7 +315,7 @@ static void __init pSeries_setup_arch(void)
>  	find_and_init_phbs();
>  	eeh_init();
>  
> -	pSeries_nvram_init();
> +	rtas_nvram_init();
>  
>  	/* Choose an idle loop */
>  	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
> diff --git a/include/asm-powerpc/nvram.h b/include/asm-powerpc/nvram.h
> index f3563e1..981fb9e 100644
> --- a/include/asm-powerpc/nvram.h
> +++ b/include/asm-powerpc/nvram.h
> @@ -68,7 +68,7 @@ extern int nvram_read_error_log(char * buff, int length, unsigned int * err_type
>  extern int nvram_clear_error_log(void);
>  extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
>  
> -extern int pSeries_nvram_init(void);
> +extern int rtas_nvram_init(void);
>  extern int mmio_nvram_init(void);
>  #endif /* __KERNEL__ */
>