ARM: S3C24XX: fix redundant checks in the irq mapping function
authorHeiko Stuebner <heiko@sntech.de>
Thu, 7 Mar 2013 03:38:13 +0000 (12:38 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 7 Mar 2013 03:38:13 +0000 (12:38 +0900)
The check during the parent handling itself was wrong, as it should have
checked for parent_irq_data.

The interrupt controller structs always contain an irq_data array with 32
entries and the only possible error could be a parent_irq assignment of >31.

As this would point to outside the irq_data array this could contain
anything including non-NULL values. Therefore correct this to check
the parent_irq value to be in the right range.

With the same explanation of a valid interrupt controller always having a
full irq_data array, the topmost irq_data check in s3c24xx_irq_map
can also go away.

Finally the mapping function is only called thru the irq_domain ops, in
which case the intc struct is already successfully created, so there is
no need to check for it again.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-s3c24xx/irq.c

index 3f3de74920942f9bd5d904ffe09012a6665a5dfc..5257c9fd9e0416f4b57c248c8258fcfcefdbe5fb 100644 (file)
@@ -324,16 +324,6 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
        struct s3c_irq_data *parent_irq_data;
        unsigned int irqno;
 
-       if (!intc) {
-               pr_err("irq-s3c24xx: no controller found for hwirq %lu\n", hw);
-               return -EINVAL;
-       }
-
-       if (!irq_data) {
-               pr_err("irq-s3c24xx: no irq data found for hwirq %lu\n", hw);
-               return -EINVAL;
-       }
-
        /* attach controller pointer to irq_data */
        irq_data->intc = intc;
 
@@ -383,13 +373,13 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
                        goto err;
                }
 
-               parent_irq_data = &parent_intc->irqs[irq_data->parent_irq];
-               if (!irq_data) {
-                       pr_err("irq-s3c24xx: no irq data found for hwirq %lu\n",
-                              hw);
+               if (irq_data->parent_irq > 31) {
+                       pr_err("irq-s3c24xx: parent irq %lu is out of range\n",
+                              irq_data->parent_irq);
                        goto err;
                }
 
+               parent_irq_data = &parent_intc->irqs[irq_data->parent_irq];
                parent_irq_data->sub_intc = intc;
                parent_irq_data->sub_bits |= (1UL << hw);