From patchwork Fri May 12 03:55:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 99704 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp115237qge; Thu, 11 May 2017 21:01:42 -0700 (PDT) X-Received: by 10.98.198.4 with SMTP id m4mr2230589pfg.160.1494561702572; Thu, 11 May 2017 21:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494561702; cv=none; d=google.com; s=arc-20160816; b=WaYDaWOhQ3U/ne2pzpPJ22DkePIfPWqTZfF0mYx+qMBRu/5xbmy4T74Q5vhYcnH9S2 fjCnnzCw0PL9Wpnp4wt1uEoCOJ3snlJJ1ocD/hjwVFUeFdk+sSRFb3QvSjQpheIcC8Bw sW4067J/MwCdAHMMo7oc2Ck7RlIf2S/V/9qy0sHj0qqeW2dVGabqMMlpmwOCQ1kFRGWL kgCrL8f7xyg3y4e958wv+cDixGqpDTScKOEM5m2TK9jxWNQgz/gme9glHbKVVzKXH/NR 8M1p5w0KgNvb1AV1iqxrw8I4CyGE8B1brDuQK2UBUODmmuhy4SnRJUi+80akrLpuPprN y3BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=7pr+bLpONczVYx7zp2QGXxycpJ89DU++r93xnzk+QwY=; b=IoOXLvONhXMN4HxXN4vYu5KFn8Y1Q/urfE2lJJ9Ye6Iel5wbnRuCLMXnwVSbkVKHQT sSHY9jnvJugNjdu6Fk1ECo67ucvDpG0ogMRxG9qRkgLValJ0BZVyixWSA/8wRtB2641V FFQt4Ojo6gD/0ZYk/LkR3sFgV/qoLJkJrYHPLuWCkCc08pJ9ijYcBCZBHzBEw7CwU7SC 79cua9tqype3btEHHfL5hpdvXRA8o6AEJw9Z3PLlJqZLhQ6gUY9bI/Z43nHK5IlLtAwR LIM6eZcgZ94aLr82COx7hzYpWMS5bNRvQH93V+ei1Kh5JQAnovMRclzJAso5YQ2ZyghZ vmjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w33si2096357plb.20.2017.05.11.21.01.42; Thu, 11 May 2017 21:01:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756709AbdELEBX (ORCPT + 25 others); Fri, 12 May 2017 00:01:23 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:6285 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756261AbdELEAr (ORCPT ); Fri, 12 May 2017 00:00:47 -0400 Received: from 172.30.72.57 (EHLO DGGEML403-HUB.china.huawei.com) ([172.30.72.57]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AOJ23725; Fri, 12 May 2017 12:00:42 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEML403-HUB.china.huawei.com (10.3.17.33) with Microsoft SMTP Server id 14.3.301.0; Fri, 12 May 2017 12:00:34 +0800 From: Hanjun Guo To: Marc Zyngier , Thomas Gleixner CC: Kefeng Wang , Wei Yongjun , MaJun , , , Hanjun Guo Subject: [PATCH v2 1/3] irqchip/mbigen: Fix memory mapping code Date: Fri, 12 May 2017 11:55:26 +0800 Message-ID: <1494561328-39514-2-git-send-email-guohanjun@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1494561328-39514-1-git-send-email-guohanjun@huawei.com> References: <1494561328-39514-1-git-send-email-guohanjun@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.5915336D.0140, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 3bbdc51752d487e50436c7d5b7f16479 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hanjun Guo 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 --- drivers/irqchip/irq-mbigen.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 1.7.12.4 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);