Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4751505c authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[POWERPC] Cleanup calling mmio_nvram_init 



This makes mmio_nvram_init() callable unconditionally by providing
a dummy definition when CONFIG_MMIO_NVRAM is not defined.

Signed-off-by: default avatarKou Ishizaki <Kou.Ishizaki@toshiba.co.jp>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 38958dd9

arch/powerpc/platforms/cell/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -179,9 +179,7 @@ static void __init cell_setup_arch(void) 
	conswitchp = &dummy_con;

#endif



#ifdef CONFIG_MMIO_NVRAM

	mmio_nvram_init();

#endif

}



static int __init cell_probe(void)

include/asm-powerpc/nvram.h

+11 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#ifndef _ASM_POWERPC_NVRAM_H

#define _ASM_POWERPC_NVRAM_H



#include <linux/errno.h>



#define NVRW_CNT 0x20

#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */

#define NVRAM_BLOCK_LEN 16
@@ -71,7 +73,16 @@ 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);



#ifdef CONFIG_MMIO_NVRAM

extern int mmio_nvram_init(void);

#else

static inline int mmio_nvram_init(void)

{

	return -ENODEV;

}

#endif



#endif /* __KERNEL__ */



/* PowerMac specific nvram stuffs */