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 <geert+renesas@xxxxxxxxx> AuthorDate: Wed, 12 Feb 2020 09:47:44 +01:00 Committer: Marc Zyngier <maz@xxxxxxxxxx> 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 <geert+renesas@xxxxxxxxx> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200212084744.9376-1-geert+renesas@xxxxxxxxx --- 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;