PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate

This simplifies IRQ resource parsing slightly by computing all the
IORESOURCE_IRQ_* flags at the same time.

This also keeps track of shareability information when parsing options
from _PRS.  Previously we ignored shareability in _PRS.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 2a47e977d8a87442884553b6425a360cc7cfc146..a5f5e2130e75cd12cb578256663e0f32d2b8ec09 100644 (file)
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -32,19 +32,26 @@
 /*
  * Allocated Resources
  */
-static int irq_flags(int triggering, int polarity)
+static int irq_flags(int triggering, int polarity, int shareable)
 {
+       int flags;
+
        if (triggering == ACPI_LEVEL_SENSITIVE) {
                if (polarity == ACPI_ACTIVE_LOW)
-                       return IORESOURCE_IRQ_LOWLEVEL;
+                       flags = IORESOURCE_IRQ_LOWLEVEL;
                else
-                       return IORESOURCE_IRQ_HIGHLEVEL;
+                       flags = IORESOURCE_IRQ_HIGHLEVEL;
        } else {
                if (polarity == ACPI_ACTIVE_LOW)
-                       return IORESOURCE_IRQ_LOWEDGE;
+                       flags = IORESOURCE_IRQ_LOWEDGE;
                else
-                       return IORESOURCE_IRQ_HIGHEDGE;
+                       flags = IORESOURCE_IRQ_HIGHEDGE;
        }
+
+       if (shareable)
+               flags |= IORESOURCE_IRQ_SHAREABLE;
+
+       return flags;
 }
 
 static void decode_irq_flags(int flag, int *triggering, int *polarity)
@@ -110,16 +117,13 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
        }
 
        res->irq_resource[i].flags = IORESOURCE_IRQ;    // Also clears _UNSET flag
-       res->irq_resource[i].flags |= irq_flags(triggering, polarity);
+       res->irq_resource[i].flags |= irq_flags(triggering, polarity, shareable);
        irq = acpi_register_gsi(gsi, triggering, polarity);
        if (irq < 0) {
                res->irq_resource[i].flags |= IORESOURCE_DISABLED;
                return;
        }
 
-       if (shareable)
-               res->irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;
-
        res->irq_resource[i].start = irq;
        res->irq_resource[i].end = irq;
        pcibios_penalize_isa_irq(irq, 1);
@@ -441,7 +445,7 @@ static __init void pnpacpi_parse_irq_option(struct pnp_option *option,
        for (i = 0; i < p->interrupt_count; i++)
                if (p->interrupts[i])
                        __set_bit(p->interrupts[i], irq->map);
-       irq->flags = irq_flags(p->triggering, p->polarity);
+       irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
 
        pnp_register_irq_resource(option, irq);
 }
@@ -461,7 +465,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
        for (i = 0; i < p->interrupt_count; i++)
                if (p->interrupts[i])
                        __set_bit(p->interrupts[i], irq->map);
-       irq->flags = irq_flags(p->triggering, p->polarity);
+       irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
 
        pnp_register_irq_resource(option, irq);
 }