| Message ID | 20191218135230.2610161-1-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | soc: renesas: rcar-rst: fix __iomem on configure call | expand |
Hi Ben, On Wed, Dec 18, 2019 at 2:52 PM Ben Dooks (Codethink) <ben.dooks@codethink.co.uk> wrote: > The configure call back takes a register pointer, so should > have been marked with __iomem. Add this to silence the > following sparse warnings: > > rivers/soc/renesas/rcar-rst.c:33:22: warning: incorrect type in initializer (incompatible argument 1 (different address spaces)) d > drivers/soc/renesas/rcar-rst.c:33:22: expected int ( *configure )( ... ) > drivers/soc/renesas/rcar-rst.c:33:22: got int ( * )( ... ) > drivers/soc/renesas/rcar-rst.c:97:40: warning: incorrect type in argument 1 (different address spaces) > drivers/soc/renesas/rcar-rst.c:97:40: expected void *base > drivers/soc/renesas/rcar-rst.c:97:40: got void [noderef] <asn:2> *[assigned] base > > Signed-off-by: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk> Thanks! Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v5.6... > --- a/drivers/soc/renesas/rcar-rst.c > +++ b/drivers/soc/renesas/rcar-rst.c > @@ -21,7 +21,7 @@ static int rcar_rst_enable_wdt_reset(void __iomem *base) > > struct rst_config { > unsigned int modemr; /* Mode Monitoring Register Offset */ > - int (*configure)(void *base); /* Platform specific configuration */ > + int (*configure)(void __iomem *base); /* Platform specific configuration */ ... with s/configuration/config/ to conform to the 80-char line limit. > }; > > static const struct rst_config rcar_rst_gen1 __initconst = { Gr{oetje,eeting}s, Geert
diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c index 14d05a070dd3..794d0a2659fe 100644 --- a/drivers/soc/renesas/rcar-rst.c +++ b/drivers/soc/renesas/rcar-rst.c @@ -21,7 +21,7 @@ static int rcar_rst_enable_wdt_reset(void __iomem *base) struct rst_config { unsigned int modemr; /* Mode Monitoring Register Offset */ - int (*configure)(void *base); /* Platform specific configuration */ + int (*configure)(void __iomem *base); /* Platform specific configuration */ }; static const struct rst_config rcar_rst_gen1 __initconst = {
The configure call back takes a register pointer, so should have been marked with __iomem. Add this to silence the following sparse warnings: rivers/soc/renesas/rcar-rst.c:33:22: warning: incorrect type in initializer (incompatible argument 1 (different address spaces)) drivers/soc/renesas/rcar-rst.c:33:22: expected int ( *configure )( ... ) drivers/soc/renesas/rcar-rst.c:33:22: got int ( * )( ... ) drivers/soc/renesas/rcar-rst.c:97:40: warning: incorrect type in argument 1 (different address spaces) drivers/soc/renesas/rcar-rst.c:97:40: expected void *base drivers/soc/renesas/rcar-rst.c:97:40: got void [noderef] <asn:2> *[assigned] base Signed-off-by: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk> --- Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Magnus Damm <magnus.damm@gmail.com> Cc: linux-renesas-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/soc/renesas/rcar-rst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)