PNPACPI: simplify irq_flags()

No need for a temporary variable; just return the flags once we know them.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 51478c084220..a0784fe5bcd8 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -34,20 +34,17 @@
  */
 static int irq_flags(int triggering, int polarity)
 {
-        int flag;
-
         if (triggering == ACPI_LEVEL_SENSITIVE) {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWLEVEL;
+                        return IORESOURCE_IRQ_LOWLEVEL;
                 else
-                        flag = IORESOURCE_IRQ_HIGHLEVEL;
+                        return IORESOURCE_IRQ_HIGHLEVEL;
         } else {
                 if (polarity == ACPI_ACTIVE_LOW)
-                        flag = IORESOURCE_IRQ_LOWEDGE;
+                        return IORESOURCE_IRQ_LOWEDGE;
                 else
-                        flag = IORESOURCE_IRQ_HIGHEDGE;
+                        return IORESOURCE_IRQ_HIGHEDGE;
         }
-        return flag;
 }
 
 static void decode_irq_flags(int flag, int *triggering, int *polarity)