From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757217AbdELIg6 (ORCPT ); Fri, 12 May 2017 04:36:58 -0400 Received: from terminus.zytor.com ([65.50.211.136]:53341 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752111AbdELIgy (ORCPT ); Fri, 12 May 2017 04:36:54 -0400 Date: Fri, 12 May 2017 01:34:35 -0700 From: tip-bot for Hanjun Guo Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, wangkefeng.wang@huawei.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, majun258@huawei.com, hanjun.guo@linaro.org, weiyongjun1@huawei.com Reply-To: majun258@huawei.com, hanjun.guo@linaro.org, weiyongjun1@huawei.com, mingo@kernel.org, wangkefeng.wang@huawei.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, marc.zyngier@arm.com In-Reply-To: <1494561328-39514-2-git-send-email-guohanjun@huawei.com> References: <1494561328-39514-2-git-send-email-guohanjun@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/mbigen: Fix memory mapping code Git-Commit-ID: 5ba9b0a14132d0b8d97affe909f324045a968d03 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: 5ba9b0a14132d0b8d97affe909f324045a968d03 Gitweb: http://git.kernel.org/tip/5ba9b0a14132d0b8d97affe909f324045a968d03 Author: Hanjun Guo AuthorDate: Fri, 12 May 2017 11:55:26 +0800 Committer: Thomas Gleixner CommitDate: Fri, 12 May 2017 10:25:37 +0200 irqchip/mbigen: Fix memory mapping code Some mbigens share memory regions, and devm_ioremap_resource does not allow to share resources which will break the probe of mbigen, in opposition to devm_ioremap. This patch restores back usage of devm_ioremap function, but with proper error handling and logging. Fixes: 216646e4d82e ("irqchip/mbigen: Fix return value check in mbigen_device_probe()") Signed-off-by: Hanjun Guo Acked-by: Marc Zyngier Cc: Kefeng Wang Cc: linuxarm@huawei.com Cc: Wei Yongjun Cc: MaJun Link: http://lkml.kernel.org/r/1494561328-39514-2-git-send-email-guohanjun@huawei.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-mbigen.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index d2306c8..0f5e66e 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -337,9 +337,12 @@ static int mbigen_device_probe(struct platform_device *pdev) mgn_chip->pdev = pdev; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mgn_chip->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(mgn_chip->base)) - return PTR_ERR(mgn_chip->base); + mgn_chip->base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (!mgn_chip->base) { + dev_err(&pdev->dev, "failed to ioremap %pR\n", res); + return -ENOMEM; + } if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) err = mbigen_of_create_domain(pdev, mgn_chip);