2020-02-12 09:12:15

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
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 6e5e3172796bca3b..3819185bfd02c63f 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;
--
2.17.1


Subject: [tip: irq/core] irqchip/renesas-intc-irqpin: Restore devm_ioremap() alignment

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 <[email protected]>
AuthorDate: Wed, 12 Feb 2020 09:47:44 +01:00
Committer: Marc Zyngier <[email protected]>
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 <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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;