Commit b5064efe authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/setup: cleanup ifdef mess in check_cache_coherency() 



Use IS_ENABLED() instead of #ifdefs

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e9e9b25a

arch/powerpc/kernel/setup-common.c

+3 −7
Original line number Diff line number Diff line
@@ -737,23 +737,19 @@ void __init setup_panic(void) 
 * BUG() in that case.

 */



#ifdef CONFIG_NOT_COHERENT_CACHE

#define KERNEL_COHERENCY	0

#else

#define KERNEL_COHERENCY	1

#endif

#define KERNEL_COHERENCY	(!IS_ENABLED(CONFIG_NOT_COHERENT_CACHE))



static int __init check_cache_coherency(void)

{

	struct device_node *np;

	const void *prop;

	int devtree_coherency;

	bool devtree_coherency;



	np = of_find_node_by_path("/");

	prop = of_get_property(np, "coherency-off", NULL);

	of_node_put(np);



	devtree_coherency = prop ? 0 : 1;

	devtree_coherency = prop ? false : true;



	if (devtree_coherency != KERNEL_COHERENCY) {

		printk(KERN_ERR

CRA Git | Maintained and supported by SUSTech CRA and CCSE