xtensa: clean up WSR*/RSR*/get_sr/set_sr

[sfrench/cifs-2.6.git] / arch / xtensa / kernel / setup.c

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 351283b60df6174af90cfd789f991f58da68f131..4ec6fbb696bf4df7b8019f7315c79a354804c6ea 100644 (file)
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -318,9 +318,9 @@ static inline int mem_reserve(unsigned long start, unsigned long end)
 void __init setup_arch(char **cmdline_p)
 {
        pr_info("config ID: %08x:%08x\n",
-               get_sr(SREG_EPC), get_sr(SREG_EXCSAVE));
-       if (get_sr(SREG_EPC) != XCHAL_HW_CONFIGID0 ||
-           get_sr(SREG_EXCSAVE) != XCHAL_HW_CONFIGID1)
+               xtensa_get_sr(SREG_EPC), xtensa_get_sr(SREG_EXCSAVE));
+       if (xtensa_get_sr(SREG_EPC) != XCHAL_HW_CONFIGID0 ||
+           xtensa_get_sr(SREG_EXCSAVE) != XCHAL_HW_CONFIGID1)
                pr_info("built for config ID: %08x:%08x\n",
                        XCHAL_HW_CONFIGID0, XCHAL_HW_CONFIGID1);
 
@@ -596,7 +596,7 @@ c_show(struct seq_file *f, void *slot)
                      num_online_cpus(),
                      cpumask_pr_args(cpu_online_mask),
                      XCHAL_BUILD_UNIQUE_ID,
-                     get_sr(SREG_EPC), get_sr(SREG_EXCSAVE),
+                     xtensa_get_sr(SREG_EPC), xtensa_get_sr(SREG_EXCSAVE),
                      XCHAL_HAVE_BE ?  "big" : "little",
                      ccount_freq/1000000,
                      (ccount_freq/10000) % 100,