Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 770d583c authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

powerpc/wii: fix resource printk format warnings 



[ Upstream commit 7b69600d4da0049244e9be2f5ef5a2f8e04fcd9a ]

Use "%pa" format specifier for resource_size_t to avoid compiler
printk format warnings.

../arch/powerpc/platforms/embedded6xx/flipper-pic.c: In function 'flipper_pic_init':
../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
../arch/powerpc/platforms/embedded6xx/flipper-pic.c:148:9: note: in expansion of macro 'pr_info'
  148 |         pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
      |         ^~~~~~~

../arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_init':
../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
../arch/powerpc/platforms/embedded6xx/hlwd-pic.c:174:9: note: in expansion of macro 'pr_info'
  174 |         pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
      |         ^~~~~~~

../arch/powerpc/platforms/embedded6xx/wii.c: In function 'wii_ioremap_hw_regs':
../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
../arch/powerpc/platforms/embedded6xx/wii.c:77:17: note: in expansion of macro 'pr_info'
   77 |                 pr_info("%s at 0x%08x mapped to 0x%p\n", name,
      |                 ^~~~~~~

Fixes: 028ee972 ("powerpc: gamecube/wii: flipper interrupt controller support")
Fixes: 9c21025c ("powerpc: wii: hollywood interrupt controller support")
Fixes: 5a7ee319 ("powerpc: wii: platform support")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230223070116.660-3-rdunlap@infradead.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f60c8d7c

arch/powerpc/platforms/embedded6xx/flipper-pic.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct irq_domain * __init flipper_pic_init(struct device_node *np) 
	}

	io_base = ioremap(res.start, resource_size(&res));



	pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);

	pr_info("controller at 0x%pa mapped to 0x%p\n", &res.start, io_base);



	__flipper_quiesce(io_base);

arch/powerpc/platforms/embedded6xx/hlwd-pic.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct irq_domain *hlwd_pic_init(struct device_node *np) 
		return NULL;

	}



	pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);

	pr_info("controller at 0x%pa mapped to 0x%p\n", &res.start, io_base);



	__hlwd_quiesce(io_base);

arch/powerpc/platforms/embedded6xx/wii.c

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ static void __iomem *wii_ioremap_hw_regs(char *name, char *compatible) 


	hw_regs = ioremap(res.start, resource_size(&res));

	if (hw_regs) {

		pr_info("%s at 0x%08x mapped to 0x%p\n", name,

			res.start, hw_regs);

		pr_info("%s at 0x%pa mapped to 0x%p\n", name,

			&res.start, hw_regs);

	}



out_put: