diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-08-15 10:32:09 -0600 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-24 01:27:23 -0400 |
| commit | 4cec086b219224167c22dd020d3dd2d9220e1d98 (patch) | |
| tree | a88e8ef2ea8b9c51cfcf259643cacb2f38e13bf7 /drivers/pnp | |
| parent | 1e0aa9ad721349781b728ec4226876247e3fd431 (diff) | |
| download | kernel_samsung_aries-4cec086b219224167c22dd020d3dd2d9220e1d98.zip kernel_samsung_aries-4cec086b219224167c22dd020d3dd2d9220e1d98.tar.gz kernel_samsung_aries-4cec086b219224167c22dd020d3dd2d9220e1d98.tar.bz2 | |
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>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 51478c0..a0784fe 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) |