mips IO: make phys/bus_to_bus/phys static

Ham22 · Ham22 · commit e171e3284ef6 · 2016-10-21T14:40:20.000+01:00
This matches the consistency of phys/virt_to_virt/phys which was
changed to match kernel and supports gcc 5.x.

Signed-off-by: Ian Pozella &lt;Ian.Pozella@imgtec.com&gt;
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
@@ -560,12 +560,12 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 
 #ifdef CONFIG_PHYS_TO_BUS
 
-extern inline unsigned long phys_to_bus(unsigned long phys)
+static inline unsigned long phys_to_bus(unsigned long phys)
 {
 	return (unsigned long) virt_to_phys((void * )phys);
 }
 
-extern inline unsigned long bus_to_phys(unsigned long bus)
+static inline unsigned long bus_to_phys(unsigned long bus)
 {
 	return (unsigned long) phys_to_virt(bus);
 }
diff --git a/include/phys2bus.h b/include/phys2bus.h
@@ -8,8 +8,8 @@
 #define _BUS_ADDR_H
 
 #ifdef CONFIG_PHYS_TO_BUS
-unsigned long phys_to_bus(unsigned long phys);
-unsigned long bus_to_phys(unsigned long bus);
+static unsigned long phys_to_bus(unsigned long phys);
+static unsigned long bus_to_phys(unsigned long bus);
 #else
 static inline unsigned long phys_to_bus(unsigned long phys)
 {

Original file line number	Diff line number	Diff line change
`@@ -560,12 +560,12 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)`
`560`	`560`
`561`	`561`	`#ifdef CONFIG_PHYS_TO_BUS`
`562`	`562`
`563`		`-extern inline unsigned long phys_to_bus(unsigned long phys)`
	`563`	`+static inline unsigned long phys_to_bus(unsigned long phys)`
`564`	`564`	`{`
`565`	`565`	`return (unsigned long) virt_to_phys((void * )phys);`
`566`	`566`	`}`
`567`	`567`
`568`		`-extern inline unsigned long bus_to_phys(unsigned long bus)`
	`568`	`+static inline unsigned long bus_to_phys(unsigned long bus)`
`569`	`569`	`{`
`570`	`570`	`return (unsigned long) phys_to_virt(bus);`
`571`	`571`	`}`