Commit 1f82c332 authored Jan 04, 2021 by Greg Kroah-Hartman

Revert "staging: board: Remove macro board_staging"



This reverts commit 850c35bb as it
breaks the build.

Cc: Song Chen <chensong_2000@189.cn>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210104122653.6f35b9bb@canb.auug.org.au


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1e9a9c7c

drivers/staging/board/armadillo800eva.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -80,11 +80,9 @@ static const struct board_staging_dev armadillo800eva_devices[] __initconst = {

		static void __init armadillo800eva_init(void)
		{
		if (of_machine_is_compatible("renesas,armadillo800eva")) {
		board_staging_gic_setup_xlate("arm,pl390", 32);
		board_staging_register_devices(armadillo800eva_devices,
		ARRAY_SIZE(armadillo800eva_devices));
		}
		}

		device_initcall(armadillo800eva_init);
		board_staging("renesas,armadillo800eva", armadillo800eva_init);

drivers/staging/board/board.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -32,4 +32,15 @@ int board_staging_register_device(const struct board_staging_dev *dev);
		void board_staging_register_devices(const struct board_staging_dev *devs,
		unsigned int ndevs);

		#define board_staging(str, fn) \
		static int __init runtime_board_check(void) \
		{ \
		if (of_machine_is_compatible(str)) \
		fn(); \
		\
		return 0; \
		} \
		\
		device_initcall(runtime_board_check)

		#endif /* __BOARD_H__ */

drivers/staging/board/kzm9d.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ static struct resource usbs1_res[] __initdata = {

		static void __init kzm9d_init(void)
		{
		if (of_machine_is_compatible("renesas,kzm9d")) {
		board_staging_gic_setup_xlate("arm,pl390", 32);

		if (!board_staging_dt_node_available(usbs1_res,
		@@ -23,6 +22,5 @@ static void __init kzm9d_init(void)
		ARRAY_SIZE(usbs1_res));
		}
		}
		}

		device_initcall(kzm9d_init);
		board_staging("renesas,kzm9d", kzm9d_init);