From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69806C2D0E5 for ; Sun, 29 Mar 2020 20:26:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4699720784 for ; Sun, 29 Mar 2020 20:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728952AbgC2U0i (ORCPT ); Sun, 29 Mar 2020 16:26:38 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:57060 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728855AbgC2U0c (ORCPT ); Sun, 29 Mar 2020 16:26:32 -0400 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jIeVo-0001Vc-N7; Sun, 29 Mar 2020 22:26:28 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 05D0A1C0451; Sun, 29 Mar 2020 22:26:23 +0200 (CEST) Date: Sun, 29 Mar 2020 20:26:22 -0000 From: "tip-bot2 for Geert Uytterhoeven" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/renesas-intc-irqpin: Restore devm_ioremap() alignment Cc: Geert Uytterhoeven , Marc Zyngier , x86 , LKML In-Reply-To: <20200212084744.9376-1-geert+renesas@glider.be> References: <20200212084744.9376-1-geert+renesas@glider.be> MIME-Version: 1.0 Message-ID: <158551358260.28353.10168267569059278546.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: bc714c8bd4b7f1f29f9b15d79211c5fb3aa63c4d Gitweb: https://git.kernel.org/tip/bc714c8bd4b7f1f29f9b15d79211c5fb3aa63c4d Author: Geert Uytterhoeven AuthorDate: Wed, 12 Feb 2020 09:47:44 +01:00 Committer: Marc Zyngier CommitterDate: Sun, 08 Mar 2020 14:25:46 irqchip/renesas-intc-irqpin: Restore devm_ioremap() alignment Restore alignment of the continuation of the devm_ioremap() call in intc_irqpin_probe(). Fixes: 4bdc0d676a643140 ("remove ioremap_nocache and devm_ioremap_nocache") Signed-off-by: Geert Uytterhoeven Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20200212084744.9376-1-geert+renesas@glider.be --- drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c index 6e5e317..3819185 100644 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c @@ -461,7 +461,7 @@ static int intc_irqpin_probe(struct platform_device *pdev) } i->iomem = devm_ioremap(dev, io[k]->start, - resource_size(io[k])); + resource_size(io[k])); if (!i->iomem) { dev_err(dev, "failed to remap IOMEM\n"); ret = -ENXIO;