of: drop symbols declared by _OF_DECLARE() from modules

masahir0y · robherring · commit 71f50c6d9a22 · 2016-01-25T08:35:50.000-06:00
The users of this macro (OF_EARLYCON_DECLARE, CLK_OF_DECLARE, IRQCHIP_DECLARE, etc.) are only parsed in the early boot stage. Such symbols contained in modules are never used. This commit fixes the link error introduced by commit b8d20e0 ("serial: 8250_uniphier: add earlycon support"); the combination of CONFIG_SERIAL_8250_UNIPHIER=m and CONFIG_SERIAL_8250_CONSOLE=y fails to link: ERROR: "early_serial8250_setup" [drivers/tty/serial/8250/8250_uniphier.ko] undefined! Fixes: b8d20e0 ("serial: 8250_uniphier: add earlycon support") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rob Herring <robh@kernel.org>
diff --git a/include/linux/of.h b/include/linux/of.h
@@ -929,7 +929,7 @@ static inline int of_get_available_child_count(const struct device_node *np)
 	return num;
 }
 
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && !defined(MODULE)
 #define _OF_DECLARE(table, name, compat, fn, fn_type)			\
 	static const struct of_device_id __of_table_##name		\
 		__used __section(__##table##_of_table)			\

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ static inline int of_get_available_child_count(const struct device_node *np)`
`929`	`929`	`return num;`
`930`	`930`	`}`
`931`	`931`
`932`		`-#ifdef CONFIG_OF`
	`932`	`+#if defined(CONFIG_OF) && !defined(MODULE)`
`933`	`933`	`#define _OF_DECLARE(table, name, compat, fn, fn_type) \`
`934`	`934`	`static const struct of_device_id __of_table_##name \`
`935`	`935`	`__used __section(__##table##_of_table) \`