From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964814AbcBITBy (ORCPT ); Tue, 9 Feb 2016 14:01:54 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34465 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754030AbcBITBG (ORCPT ); Tue, 9 Feb 2016 14:01:06 -0500 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org Cc: linux-kernel@vger.kernel.org, David Daney Subject: [PATCH v2 8/8] MIPS: OCTEON: Simplify code in octeon_irq_ciu_gpio_set_type() Date: Tue, 9 Feb 2016 11:00:13 -0800 Message-Id: <1455044413-9823-9-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1455044413-9823-1-git-send-email-ddaney.cavm@gmail.com> References: <1455044413-9823-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Daney Use the trigger type passed in to the function instead of reading it back out of the irq_data. Signed-off-by: David Daney --- arch/mips/cavium-octeon/octeon-irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 9b6a65b..368eb49 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -713,7 +713,7 @@ static int octeon_irq_ciu_gpio_set_type(struct irq_data *data, unsigned int t) irqd_set_trigger_type(data, t); octeon_irq_gpio_setup(data); - if (irqd_get_trigger_type(data) & IRQ_TYPE_EDGE_BOTH) + if (t & IRQ_TYPE_EDGE_BOTH) irq_set_handler_locked(data, handle_edge_irq); else irq_set_handler_locked(data, handle_level_irq); -- 1.7.11.7