From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755301AbbJIUzy (ORCPT ); Fri, 9 Oct 2015 16:55:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53913 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424AbbJIUzw (ORCPT ); Fri, 9 Oct 2015 16:55:52 -0400 Date: Fri, 9 Oct 2015 13:55:34 -0700 From: tip-bot for Chen-Yu Tsai Message-ID: Cc: mingo@kernel.org, maxime.ripard@free-electrons.com, tglx@linutronix.de, jason@lakedaemon.net, linux-kernel@vger.kernel.org, wens@csie.org, marc.zyngier@arm.com, hpa@zytor.com Reply-To: marc.zyngier@arm.com, hpa@zytor.com, mingo@kernel.org, maxime.ripard@free-electrons.com, tglx@linutronix.de, jason@lakedaemon.net, wens@csie.org, linux-kernel@vger.kernel.org In-Reply-To: <1444063334-19832-3-git-send-email-wens@csie.org> References: <1444063334-19832-3-git-send-email-wens@csie.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/sunxi-nmi: Switch to of_io_request_and_map () from of_iomap() Git-Commit-ID: 0e841b04c829f59a5d5745f98d2857f48882efe9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0e841b04c829f59a5d5745f98d2857f48882efe9 Gitweb: http://git.kernel.org/tip/0e841b04c829f59a5d5745f98d2857f48882efe9 Author: Chen-Yu Tsai AuthorDate: Tue, 6 Oct 2015 00:42:14 +0800 Committer: Thomas Gleixner CommitDate: Fri, 9 Oct 2015 22:47:28 +0200 irqchip/sunxi-nmi: Switch to of_io_request_and_map() from of_iomap() Switch to the new of_io_request_and_map() call, so the IO resource is properly held, and also shows up in /proc/iomem. Signed-off-by: Chen-Yu Tsai Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper Cc: Marc Zyngier Cc: Maxime Ripard Link: http://lkml.kernel.org/r/1444063334-19832-3-git-send-email-wens@csie.org Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-sunxi-nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index c4f7196..4ef1780 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -153,7 +153,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, } gc = irq_get_domain_generic_chip(domain, 0); - gc->reg_base = of_iomap(node, 0); + gc->reg_base = of_io_request_and_map(node, 0, of_node_full_name(node)); if (!gc->reg_base) { pr_err("unable to map resource\n"); ret = -ENOMEM;