From patchwork Wed Jul 19 19:07:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 9853041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D4D8602BD for ; Wed, 19 Jul 2017 19:10:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 767EF20856 for ; Wed, 19 Jul 2017 19:10:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B2EA285CD; Wed, 19 Jul 2017 19:10:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 001BC20856 for ; Wed, 19 Jul 2017 19:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=+47pjPMcKKgbRKqiQFKZF9aaZHc6zUEGGJGBM1WQrLo=; b=WjwDldDVVLaMeaUojMROTU5xRZ jrC1hl1DxbOR/w8AbYUBr9SQkvzvtBXSWU4a5LH17JWljn1KyDq7KHtVjO3fVr5LfA0mlOgTqJ/Fs aXM+1vJTE5L/d7WU3vv7Un10kuEHoosOYAQ9nZ8hTW9THhzscwgMiHCMgjxqzWEurkq+8i98ZjynP 1iIlQPEOHfDGkytpcxopnRcF3Idqk3yMEQoDLpMfF3qao5hRvrBRy6Ipo6NFM7pVecBBoh71GpLj+ 5sAyM56FHfM/zWQFwtobFbNHDIfpFGomvnSFawjCx2u4dOT5CG1Ogk0BCTUo7CNjngFNrT98xBAcc stzJ1XFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXuMT-0002dS-HD; Wed, 19 Jul 2017 19:10:17 +0000 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXuLK-0000hA-MU for linux-arm-kernel@lists.infradead.org; Wed, 19 Jul 2017 19:09:15 +0000 Received: by mail-qk0-x242.google.com with SMTP id t2so480916qkc.5 for ; Wed, 19 Jul 2017 12:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=by0/jUy+wdDqSRKigRsA+/wH1xecsQSzJ3grQpkZNCc=; b=NuK6JkHY/2wYJeS/igMAbHu+Z7Gs9WhN2LMK4UBZ8zR8kDcqFH9981WtzedXQS9COu sn4oK7NbFDsvx0X8eNAtIVZXl0+kseWnXXTDjLPcHMyjIEgqCmlpPlv3zdbRcAYZQHBp ZbK8FiiAbEy281UcY7fw1OvBtxIPEDXgD1SE7RzTD0NFMB/AOAdQ0Q8nZ6SPrv5PgL3f lOrutNxyqidlopQak4KEwBz8ydjgkNMpHfcHxv89TJ7ufE5Hm3YYw9wdoDbJC37Q3n2a LgmGngiWH+RJ3AtY3NpnMR2RZNO2wHmcOSRLKpRofS69O2joezB1TdvTMD5nw1fPcvLq 5Vow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=by0/jUy+wdDqSRKigRsA+/wH1xecsQSzJ3grQpkZNCc=; b=XfmKRnvVexcB+fbmt24PE5ui1ovKDjbCLBDIUyxT4xK/qCfYBgX2Ps88hs9Apl1n71 /2xhxImWbB1RtzT1fdsyAnT4G2h06RZGxS3rt0gnTa5FKhV7qXfHumMd0rpSOnQRyJ5f 05v/PjKedixquP+AtSIQ5IiXmicSWCiDi/B5CKqVaVHOkMSRZzSzbmqwgFZvMPQYc5Td JSZ3iJH5CMv5IXQn7fFi01O3Kp8SNsUROLcqiLxQ1TY6zUcv7URHrFFYuDHFc3/FFTFJ 2DLtnmlVK9g/EqIhLIdW3sfjNPSTaU8PXQO7e14TYK9t7LCzZ6/TpknwHIpSDV2gMmrM RA4Q== X-Gm-Message-State: AIVw110sfZflG39tGlFy4BH3K9paKX7HD+ELAQ1YVq23Ll8G/y2DL2CR 6m2c83gArWY+EQ== X-Received: by 10.55.198.132 with SMTP id s4mr1486753qkl.280.1500491325436; Wed, 19 Jul 2017 12:08:45 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id 73sm518082qkx.30.2017.07.19.12.08.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 12:08:44 -0700 (PDT) From: Doug Berger To: Thomas Gleixner Subject: [PATCH v2 3/6] genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() Date: Wed, 19 Jul 2017 12:07:31 -0700 Message-Id: <20170719190734.18566-4-opendmb@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170719190734.18566-1-opendmb@gmail.com> References: <20170719190734.18566-1-opendmb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170719_120908_165959_2B52E219 X-CRM114-Status: GOOD ( 10.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Sebastian Frias , Doug Berger , Jason Cooper , linux-mips@linux-mips.org, Boris Brezillon , Marc Zyngier , Bartosz Golaszewski , Kevin Cernekee , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, Gregory Fong , Florian Fainelli , Brian Norris , linux-arm-kernel@lists.infradead.org, Marc Gonzalez MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Any usage of the irq_gc_mask_disable_reg_and_ack() function has been replaced with the desired functionality. 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 5b27f65c47d0..c73e2eca4abd 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_eoi(struct irq_data *d); int irq_gc_set_wake(struct irq_data *d, unsigned int on); diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 7f61b6e9f5ca..49ea3347719e 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 *