From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: [PATCH 19/25] PNPACPI: simplify irq_flags() Date: Fri, 24 Aug 2007 03:21:06 -0400 Message-ID: <11879400951708-git-send-email-len.brown@intel.com> References: <11879400723077-git-send-email-len.brown@intel.com> <11879400762710-git-send-email-len.brown@intel.com> <11879400782033-git-send-email-len.brown@intel.com> <11879400793131-git-send-email-len.brown@intel.com> <11879400794174-git-send-email-len.brown@intel.com> <11879400802531-git-send-email-len.brown@intel.com> <11879400812208-git-send-email-len.brown@intel.com> <11879400823500-git-send-email-len.brown@intel.com> <11879400841550-git-send-email-len.brown@intel.com> <1187940085345-git-send-email-len.brown@intel.com> <1187940086685-git-send-email-len.brown@intel.com> <11879400872911-git-send-email-len.brown@intel.com> <11879400882727-git-send-email-len.brown@intel.com> <11879400892741-git-send-email-len.brown@intel.com> <11879400903190-git-send-email-len.brown@intel.com> <11879400911609-git-send-email-len.brown@intel.com> <11879400921598-git-send-email-len.brown@intel.com> <11879400933976-git-send-email-len.brown@intel.com> <1187940094867-git-send-email-len.brown@intel.com> Return-path: Received: from mga01.intel.com ([192.55.52.88]:7250 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763295AbXHXHVh (ORCPT ); Fri, 24 Aug 2007 03:21:37 -0400 In-Reply-To: <1187940094867-git-send-email-len.brown@intel.com> Message-Id: <4cec086b219224167c22dd020d3dd2d9220e1d98.1187939443.git.len.brown@intel.com> In-Reply-To: <3c1d36da1d5ed36979340efd233ddaacc45b0a02.1187939442.git.len.brown@intel.com> References: <3c1d36da1d5ed36979340efd233ddaacc45b0a02.1187939442.git.len.brown@intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: linux-acpi@vger.kernel.org Cc: Bjorn Helgaas , Len Brown From: Bjorn Helgaas No need for a temporary variable; just return the flags once we know them. Signed-off-by: Bjorn Helgaas Acked-by: Adam Belay Signed-off-by: Len Brown --- 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) -- 1.5.3.rc6.17.g1911