From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752509AbdGGTV2 (ORCPT ); Fri, 7 Jul 2017 15:21:28 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:35856 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752452AbdGGTV0 (ORCPT ); Fri, 7 Jul 2017 15:21:26 -0400 From: Doug Berger To: Thomas Gleixner Cc: Doug Berger , Marc Zyngier , Bartosz Golaszewski , Sebastian Frias , Boris Brezillon , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/6] genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() Date: Fri, 7 Jul 2017 12:20:13 -0700 Message-Id: <20170707192016.13001-4-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 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. The incorrect and ambiguously named function is removed here to prevent accidental misuse. Signed-off-by: Doug Berger --- include/linux/irq.h | 1 - kernel/irq/generic-chip.c | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/include/linux/irq.h b/include/linux/irq.h index 23b9617bb682..d2a9150aace7 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -1002,7 +1002,6 @@ void irq_gc_mask_clr_bit(struct irq_data *d); void irq_gc_unmask_enable_reg(struct irq_data *d); void irq_gc_ack_set_bit(struct irq_data *d); void irq_gc_ack_clr_bit(struct irq_data *d); -void irq_gc_mask_disable_reg_and_ack(struct irq_data *d); void irq_gc_mask_disable_and_ack_set(struct irq_data *d); void irq_gc_mask_disable_and_ack_clr(struct irq_data *d); void irq_gc_mask_set_and_ack_set(struct irq_data *d); diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 168887a81a29..5853d9b74924 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -135,22 +135,6 @@ void irq_gc_ack_clr_bit(struct irq_data *d) } /** - * irq_gc_mask_disable_reg_and_ack - Mask and ack pending interrupt - * @d: irq_data - */ -void irq_gc_mask_disable_reg_and_ack(struct irq_data *d) -{ - struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); - struct irq_chip_type *ct = irq_data_get_chip_type(d); - u32 mask = d->mask; - - irq_gc_lock(gc); - irq_reg_writel(gc, mask, ct->regs.mask); - irq_reg_writel(gc, mask, ct->regs.ack); - irq_gc_unlock(gc); -} - -/** * irq_gc_mask_disable_and_ack_set - Mask and ack pending interrupt * @d: irq_data * -- 2.13.0