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

Commit 4c60071c authored by David Daney's avatar David Daney Committed by Grant Likely
Browse files

of/mips: Cleanup some include directives/files. 



The __init directives should go on the definitions of things, not the
declaration, also __init is meaningless for inline functions, so
remove it from prom.h.  This allows us to get rid of a useless
#include, but most of the rest of them are useless too, so kill them
as well.

If of_i2c.c needs irq definitions, it should include linux/irq.h
directly, not assume indirect inclusion via asm/prom.h.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent f2ffa5ab

arch/mips/include/asm/prom.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -12,10 +12,6 @@ 
#define __ASM_MIPS_PROM_H

#define __ASM_MIPS_PROM_H





#ifdef CONFIG_OF

#ifdef CONFIG_OF

#include <linux/init.h>



#include <asm/setup.h>

#include <asm/irq.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo.h>





/* which is compatible with the flattened device tree (FDT) */

/* which is compatible with the flattened device tree (FDT) */
@@ -27,9 +23,9 @@ extern int early_init_dt_scan_memory_arch(unsigned long node, 
extern int reserve_mem_mach(unsigned long addr, unsigned long size);

extern int reserve_mem_mach(unsigned long addr, unsigned long size);

extern void free_mem_mach(unsigned long addr, unsigned long size);

extern void free_mem_mach(unsigned long addr, unsigned long size);





extern void __init device_tree_init(void);

extern void device_tree_init(void);

#else /* CONFIG_OF */

#else /* CONFIG_OF */

static inline void __init device_tree_init(void) { }

static inline void device_tree_init(void) { }

#endif /* CONFIG_OF */

#endif /* CONFIG_OF */





#endif /* _ASM_MIPS_PROM_H */
 
#endif /* _ASM_MIPS_PROM_H */

drivers/of/of_i2c.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

 */





#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_i2c.h>

#include <linux/of_i2c.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>