1 files changed, 16 insertions, 30 deletions

diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
index e8501dbaa0b7..d8683836ee1e 100644
--- a/drivers/irqchip/exynos-combiner.c
+++ b/drivers/irqchip/exynos-combiner.c
@@ -25,6 +25,8 @@
 #define COMBINER_ENABLE_CLEAR   0x4
 #define COMBINER_INT_STATUS     0xC
 
+#define IRQ_IN_COMBINER         8
+
 static DEFINE_SPINLOCK(irq_controller_lock);
 
 struct combiner_chip_data {
@@ -112,23 +114,9 @@ static struct irq_chip combiner_chip = {
 #endif
 };
 
-static unsigned int max_combiner_nr(void)
-{
-        if (soc_is_exynos5250())
-                return EXYNOS5_MAX_COMBINER_NR;
-        else if (soc_is_exynos4412())
-                return EXYNOS4412_MAX_COMBINER_NR;
-        else if (soc_is_exynos4212())
-                return EXYNOS4212_MAX_COMBINER_NR;
-        else
-                return EXYNOS4210_MAX_COMBINER_NR;
-}
-
 static void __init combiner_cascade_irq(unsigned int combiner_nr,
                                         unsigned int irq)
 {
-        if (combiner_nr >= max_combiner_nr())
-                BUG();
         if (irq_set_handler_data(irq, &combiner_data[combiner_nr]) != 0)
                 BUG();
         irq_set_chained_handler(irq, combiner_handle_cascade_irq);
@@ -139,7 +127,7 @@ static void __init combiner_init_one(unsigned int combiner_nr,
 {
         combiner_data[combiner_nr].base = base;
         combiner_data[combiner_nr].irq_offset = irq_find_mapping(
-                combiner_irq_domain, combiner_nr * MAX_IRQ_IN_COMBINER);
+                combiner_irq_domain, combiner_nr * IRQ_IN_COMBINER);
         combiner_data[combiner_nr].irq_mask = 0xff << ((combiner_nr % 4) << 3);
         combiner_data[combiner_nr].parent_irq = irq;
 
@@ -161,7 +149,7 @@ static int combiner_irq_domain_xlate(struct irq_domain *d,
         if (intsize < 2)
                 return -EINVAL;
 
-        *out_hwirq = intspec[0] * MAX_IRQ_IN_COMBINER + intspec[1];
+        *out_hwirq = intspec[0] * IRQ_IN_COMBINER + intspec[1];
         *out_type = 0;
 
         return 0;
@@ -209,22 +197,13 @@ static unsigned int exynos4x12_combiner_extra_irq(int group)
 }
 
 void __init combiner_init(void __iomem *combiner_base,
-                          struct device_node *np)
+                          struct device_node *np,
+                          unsigned int max_nr)
 {
         int i, irq, irq_base;
-        unsigned int max_nr, nr_irq;
+        unsigned int nr_irq;
 
-        max_nr = max_combiner_nr();
-
-        if (np) {
-                if (of_property_read_u32(np, "samsung,combiner-nr", &max_nr)) {
-                        pr_info("%s: number of combiners not specified, "
-                                "setting default as %d.\n",
-                                __func__, max_nr);
-                }
-        }
-
-        nr_irq = max_nr * MAX_IRQ_IN_COMBINER;
+        nr_irq = max_nr * IRQ_IN_COMBINER;
 
         irq_base = irq_alloc_descs(COMBINER_IRQ(0, 0), 1, nr_irq, 0);
         if (IS_ERR_VALUE(irq_base)) {
@@ -258,6 +237,7 @@ static int __init combiner_of_init(struct device_node *np,
                                    struct device_node *parent)
 {
         void __iomem *combiner_base;
+        unsigned int max_nr = 20;
 
         combiner_base = of_iomap(np, 0);
         if (!combiner_base) {
@@ -265,7 +245,13 @@ static int __init combiner_of_init(struct device_node *np,
                 return -ENXIO;
         }
 
-        combiner_init(combiner_base, np);
+        if (of_property_read_u32(np, "samsung,combiner-nr", &max_nr)) {
+                pr_info("%s: number of combiners not specified, "
+                        "setting default as %d.\n",
+                        __func__, max_nr);
+        }
+
+        combiner_init(combiner_base, np, max_nr);
 
         return 0;
 }