From 3d92e3564590ff904bac6f7aeabb9ca13605be0b Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 15 Aug 2007 10:32:09 -0600 Subject: [PATCH] --- yaml --- r: 64387 b: refs/heads/master c: 4cec086b219224167c22dd020d3dd2d9220e1d98 h: refs/heads/master i: 64385: c1f8e8f08b276281ac2a22806847535798c802d3 64383: 72c4e9e8dd8f0005e32bd78bbd8facf4aa18811c v: v3 --- [refs] | 2 +- trunk/drivers/pnp/pnpacpi/rsparser.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 84f9df67a819..ea31f22bc112 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e0aa9ad721349781b728ec4226876247e3fd431 +refs/heads/master: 4cec086b219224167c22dd020d3dd2d9220e1d98 diff --git a/trunk/drivers/pnp/pnpacpi/rsparser.c b/trunk/drivers/pnp/pnpacpi/rsparser.c index 51478c084220..a0784fe5bcd8 100644 --- a/trunk/drivers/pnp/pnpacpi/rsparser.c +++ b/trunk/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)