@@ -2792,7 +2792,6 @@ static void __init flatten_device_tree(void)
27922792 dt_struct_start , dt_struct_end );
27932793}
27942794
2795- #ifdef CONFIG_PPC_CHRP
27962795/*
27972796 * Pegasos and BriQ lacks the "ranges" property in the isa node
27982797 * Pegasos needs decimal IRQ 14/15, not hexadecimal
@@ -2843,11 +2842,7 @@ static void __init fixup_device_tree_chrp(void)
28432842 }
28442843 }
28452844}
2846- #else
2847- #define fixup_device_tree_chrp ()
2848- #endif
28492845
2850- #if defined(CONFIG_PPC64 ) && defined(CONFIG_PPC_PMAC )
28512846static void __init fixup_device_tree_pmac64 (void )
28522847{
28532848 phandle u3 , i2c , mpic ;
@@ -2887,11 +2882,7 @@ static void __init fixup_device_tree_pmac64(void)
28872882 prom_setprop (i2c , "/u3@0,f8000000/i2c@f8001000" , "interrupt-parent" ,
28882883 & parent , sizeof (parent ));
28892884}
2890- #else
2891- #define fixup_device_tree_pmac64 ()
2892- #endif
28932885
2894- #ifdef CONFIG_PPC_PMAC
28952886static void __init fixup_device_tree_pmac (void )
28962887{
28972888 __be32 val = 1 ;
@@ -2911,11 +2902,7 @@ static void __init fixup_device_tree_pmac(void)
29112902 prom_setprop (node , NULL , "#size-cells" , & val , sizeof (val ));
29122903 }
29132904}
2914- #else
2915- static inline void fixup_device_tree_pmac (void ) { }
2916- #endif
29172905
2918- #ifdef CONFIG_PPC_EFIKA
29192906/*
29202907 * The MPC5200 FEC driver requires an phy-handle property to tell it how
29212908 * to talk to the phy. If the phy-handle property is missing, then this
@@ -3047,11 +3034,7 @@ static void __init fixup_device_tree_efika(void)
30473034 /* Make sure ethernet phy-handle property exists */
30483035 fixup_device_tree_efika_add_phy ();
30493036}
3050- #else
3051- #define fixup_device_tree_efika ()
3052- #endif
30533037
3054- #ifdef CONFIG_PPC_PASEMI_NEMO
30553038/*
30563039 * CFE supplied on Nemo is broken in several ways, biggest
30573040 * problem is that it reassigns ISA interrupts to unused mpic ints.
@@ -3127,17 +3110,23 @@ static void __init fixup_device_tree_pasemi(void)
31273110
31283111 prom_setprop (iob , name , "device_type" , "isa" , sizeof ("isa" ));
31293112}
3130- #else /* !CONFIG_PPC_PASEMI_NEMO */
3131- static inline void fixup_device_tree_pasemi (void ) { }
3132- #endif
31333113
31343114static void __init fixup_device_tree (void )
31353115{
3136- fixup_device_tree_chrp ();
3137- fixup_device_tree_pmac ();
3138- fixup_device_tree_pmac64 ();
3139- fixup_device_tree_efika ();
3140- fixup_device_tree_pasemi ();
3116+ if (IS_ENABLED (CONFIG_PPC_CHRP ))
3117+ fixup_device_tree_chrp ();
3118+
3119+ if (IS_ENABLED (CONFIG_PPC_PMAC ))
3120+ fixup_device_tree_pmac ();
3121+
3122+ if (IS_ENABLED (CONFIG_PPC_PMAC ) && IS_ENABLED (CONFIG_PPC64 ))
3123+ fixup_device_tree_pmac64 ();
3124+
3125+ if (IS_ENABLED (CONFIG_PPC_EFIKA ))
3126+ fixup_device_tree_efika ();
3127+
3128+ if (IS_ENABLED (CONFIG_PPC_PASEMI_NEMO ))
3129+ fixup_device_tree_pasemi ();
31413130}
31423131
31433132static void __init prom_find_boot_cpu (void )
0 commit comments