Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752437AbdGGTVU (ORCPT ); Fri, 7 Jul 2017 15:21:20 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:34331 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbdGGTVS (ORCPT ); Fri, 7 Jul 2017 15:21:18 -0400 From: Doug Berger To: Thomas Gleixner Cc: Florian Fainelli , Doug Berger , Jason Cooper , Marc Zyngier , Marc Gonzalez , linux-kernel@vger.kernel.org (open list:IRQCHIP DRIVERS), linux-arm-kernel@lists.infradead.org (open list:ARM/TANGO ARCHITECTURE) Subject: [PATCH 2/6] irqchip/tango: Use irq_gc_mask_disable_and_ack_set Date: Fri, 7 Jul 2017 12:20:12 -0700 Message-Id: <20170707192016.13001-3-opendmb@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170707192016.13001-1-opendmb@gmail.com> References: <20170707192016.13001-1-opendmb@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1279 Lines: 31 From: Florian Fainelli Any usage of the irq_gc_mask_disable_reg_and_ack() function should be replaced with either the irq_gc_mask_disable_and_ack_set() or the irq_gc_mask_set_and_ack_set() function depending on which corrects the bugs in irq_gc_mask_disable_reg_and_ack() for a given usage. For the Tango irqchip driver, irq_gc_mask_disable_and_ack_set() seems to be what is intended, so use it. Signed-off-by: Florian Fainelli Signed-off-by: Doug Berger --- drivers/irqchip/irq-tango.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c index bdbb5c0ff7fe..0c085303a583 100644 --- a/drivers/irqchip/irq-tango.c +++ b/drivers/irqchip/irq-tango.c @@ -141,7 +141,7 @@ static void __init tangox_irq_init_chip(struct irq_chip_generic *gc, for (i = 0; i < 2; i++) { ct[i].chip.irq_ack = irq_gc_ack_set_bit; ct[i].chip.irq_mask = irq_gc_mask_disable_reg; - ct[i].chip.irq_mask_ack = irq_gc_mask_disable_reg_and_ack; + ct[i].chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set; ct[i].chip.irq_unmask = irq_gc_unmask_enable_reg; ct[i].chip.irq_set_type = tangox_irq_set_type; ct[i].chip.name = gc->domain->name; -- 2.13.0