sparc: Kill sbus_bus_type. (47a2d728) · Commits · 戴 / test

arch/sparc/include/asm/of_platform.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		*/

		extern struct bus_type ebus_bus_type;
		extern struct bus_type sbus_bus_type;

		#define of_bus_type of_platform_bus_type /* for compatibility */

+0 −9

Original line number	Diff line number	Diff line
		@@ -67,11 +67,6 @@ struct bus_type ebus_bus_type;
		EXPORT_SYMBOL(ebus_bus_type);
		#endif

		#ifdef CONFIG_SBUS
		struct bus_type sbus_bus_type;
		EXPORT_SYMBOL(sbus_bus_type);
		#endif

		struct bus_type of_platform_bus_type;
		EXPORT_SYMBOL(of_platform_bus_type);

		@@ -593,10 +588,6 @@ static int __init of_bus_driver_init(void)
		if (!err)
		err = of_bus_type_init(&ebus_bus_type, "ebus");
		#endif
		#ifdef CONFIG_SBUS
		if (!err)
		err = of_bus_type_init(&sbus_bus_type, "sbus");
		#endif

		if (!err)
		scan_of_devices();

+0 −9

Original line number	Diff line number	Diff line
		@@ -93,11 +93,6 @@ struct bus_type ebus_bus_type;
		EXPORT_SYMBOL(ebus_bus_type);
		#endif

		#ifdef CONFIG_SBUS
		struct bus_type sbus_bus_type;
		EXPORT_SYMBOL(sbus_bus_type);
		#endif

		struct bus_type of_platform_bus_type;
		EXPORT_SYMBOL(of_platform_bus_type);

		@@ -874,10 +869,6 @@ static int __init of_bus_driver_init(void)
		if (!err)
		err = of_bus_type_init(&ebus_bus_type, "ebus");
		#endif
		#ifdef CONFIG_SBUS
		if (!err)
		err = of_bus_type_init(&sbus_bus_type, "sbus");
		#endif

		if (!err)
		scan_of_devices();