2020-11-10 15:52:05

by Geert Uytterhoeven

Subject: [PATCH resend2] sh/intc: Restore devm_ioremap() alignment

Restore alignment of the continuation of the devm_ioremap() call in
register_intc_controller().

Fixes: 4bdc0d676a643140 ("remove ioremap_nocache and devm_ioremap_nocache")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/sh/intc/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index f8e070d67fa3266d..a14684ffe4c1a8ef 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -214,7 +214,7 @@ int __init register_intc_controller(struct intc_desc *desc)
d->window[k].phys = res->start;
d->window[k].size = resource_size(res);
d->window[k].virt = ioremap(res->start,
- resource_size(res));
+ resource_size(res));
if (!d->window[k].virt)
goto err2;
}
--
2.25.1

2020-11-10 15:55:50

by Sergei Shtylyov

Subject: Re: [PATCH resend2] sh/intc: Restore devm_ioremap() alignment

Hello!

On 11/10/20 6:49 PM, Geert Uytterhoeven wrote:

> Restore alignment of the continuation of the devm_ioremap() call in

It's a plain ioremap() call below, isn't it, :-)

> register_intc_controller().
>
> Fixes: 4bdc0d676a643140 ("remove ioremap_nocache and devm_ioremap_nocache")
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> drivers/sh/intc/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
> index f8e070d67fa3266d..a14684ffe4c1a8ef 100644
> --- a/drivers/sh/intc/core.c
> +++ b/drivers/sh/intc/core.c
> @@ -214,7 +214,7 @@ int __init register_intc_controller(struct intc_desc *desc)
> d->window[k].phys = res->start;
> d->window[k].size = resource_size(res);
> d->window[k].virt = ioremap(res->start,
> - resource_size(res));
> + resource_size(res));
> if (!d->window[k].virt)
> goto err2;
> }

MBR, Sergei