[PATCH] powerpc/process: Remove target specific __set_dabr()

[Christophe Leroy]

__set_dabr() are simple functions that can be inline directly
inside set_dabr() and using IS_ENABLED() instead of #ifdef

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/kernel/process.c | 37 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index d421a2c7f822..5ef99138b696 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -807,29 +807,6 @@ static void switch_hw_breakpoint(struct task_struct *new)
 #endif /* !CONFIG_HAVE_HW_BREAKPOINT */
 #endif /* CONFIG_PPC_ADV_DEBUG_REGS */
 
-#ifdef CONFIG_PPC_ADV_DEBUG_REGS
-static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
-{
-       mtspr(SPRN_DAC1, dabr);
-       if (IS_ENABLED(CONFIG_PPC_47x))
-               isync();
-       return 0;
-}
-#elif defined(CONFIG_PPC_BOOK3S)
-static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
-{
-       mtspr(SPRN_DABR, dabr);
-       if (cpu_has_feature(CPU_FTR_DABRX))
-               mtspr(SPRN_DABRX, dabrx);
-       return 0;
-}
-#else
-static inline int __set_dabr(unsigned long dabr, unsigned long dabrx)
-{
-       return -EINVAL;
-}
-#endif
-
 static inline int set_dabr(struct arch_hw_breakpoint *brk)
 {
        unsigned long dabr, dabrx;
@@ -840,7 +817,19 @@ static inline int set_dabr(struct arch_hw_breakpoint *brk)
        if (ppc_md.set_dabr)
                return ppc_md.set_dabr(dabr, dabrx);
 
-       return __set_dabr(dabr, dabrx);
+       if (IS_ENABLED(CONFIG_PPC_ADV_DEBUG_REGS)) {
+               mtspr(SPRN_DAC1, dabr);
+               if (IS_ENABLED(CONFIG_PPC_47x))
+                       isync();
+               return 0;
+       } else if (IS_ENABLED(CONFIG_PPC_BOOK3S)) {
+               mtspr(SPRN_DABR, dabr);
+               if (cpu_has_feature(CPU_FTR_DABRX))
+                       mtspr(SPRN_DABRX, dabrx);
+               return 0;
+       } else {
+               return -EINVAL;
+       }
 }
 
 static inline int set_breakpoint_8xx(struct arch_hw_breakpoint *brk)
-- 
2.25.0