mips: ralink: rt3883: soc queries and tests as functions

 Move the SoC register value queries and tests to specific functions,
 to remove repetition of logic. No functional changes intended

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index fa215c07558dd1eaf6df3578976530a3634305d8..6f8541a4bc8ef9acf6b8bf6dbee061ec9489581a 100644 (file)
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -70,29 +70,61 @@ void __init ralink_of_remap(void)
                panic("Failed to remap core resources");
 }
 
-void __init prom_soc_init(struct ralink_soc_info *soc_info)
+static unsigned int __init rt3883_get_soc_name0(void)
+{
+       return __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID0_3);
+}
+
+static unsigned int __init rt3883_get_soc_name1(void)
+{
+       return __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID4_7);
+}
+
+static bool __init rt3883_soc_valid(void)
+{
+       if (rt3883_get_soc_name0() == RT3883_CHIP_NAME0 &&
+           rt3883_get_soc_name1() == RT3883_CHIP_NAME1)
+               return true;
+       else
+               return false;
+}
+
+static const char __init *rt3883_get_soc_name(void)
+{
+       if (rt3883_soc_valid())
+               return "RT3883";
+       else
+               return "invalid";
+}
+
+static unsigned int __init rt3883_get_soc_id(void)
 {
-       const char *name;
-       u32 n0;
-       u32 n1;
-       u32 id;
+       return __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_REVID);
+}
 
-       n0 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID0_3);
-       n1 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID4_7);
-       id = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_REVID);
+static unsigned int __init rt3883_get_soc_ver(void)
+{
+       return (rt3883_get_soc_id() >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK;
+}
 
-       if (n0 == RT3883_CHIP_NAME0 && n1 == RT3883_CHIP_NAME1) {
+static unsigned int __init rt3883_get_soc_rev(void)
+{
+       return (rt3883_get_soc_id() & RT3883_REVID_ECO_ID_MASK);
+}
+
+void __init prom_soc_init(struct ralink_soc_info *soc_info)
+{
+       if (rt3883_soc_valid())
                soc_info->compatible = "ralink,rt3883-soc";
-               name = "RT3883";
-       } else {
-               panic("rt3883: unknown SoC, n0:%08x n1:%08x", n0, n1);
-       }
+       else
+               panic("rt3883: unknown SoC, n0:%08x n1:%08x",
+                     rt3883_get_soc_name0(), rt3883_get_soc_name1());
 
        snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
                "Ralink %s ver:%u eco:%u",
-               name,
-               (id >> RT3883_REVID_VER_ID_SHIFT) & RT3883_REVID_VER_ID_MASK,
-               (id & RT3883_REVID_ECO_ID_MASK));
+               rt3883_get_soc_name(),
+               rt3883_get_soc_ver(),
+               rt3883_get_soc_rev());
 
        soc_info->mem_base = RT3883_SDRAM_BASE;
        soc_info->mem_size_min = RT3883_MEM_SIZE_MIN;