sparc: Kill sbus_arch_preinit(). (f8e4d32c) · Commits · 戴 / test

arch/sparc/kernel/ioport.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -393,21 +393,15 @@ void __init sbus_setup_iommu(struct sbus_bus sbus, struct device_node dp)
		#endif
		}

		int __init sbus_arch_preinit(void)
		static int __init sparc_register_ioport(void)
		{
		register_proc_sparc_ioport();

		#ifdef CONFIG_SUN4
		{
		extern void sun4_dvma_init(void);
		sun4_dvma_init();
		}
		return 1;
		#else
		return 0;
		#endif
		}

		arch_initcall(sparc_register_ioport);

		void __init sbus_arch_postinit(void)
		{
		if (sparc_cpu_model == sun4d) {

+0 −5

Original line number	Diff line number	Diff line
		@@ -655,11 +655,6 @@ void __init sbus_setup_iommu(struct sbus_bus sbus, struct device_node dp)
		sbus_iommu_init(dp->node, sbus);
		}

		int __init sbus_arch_preinit(void)
		{
		return 0;
		}

		void __init sbus_arch_postinit(void)
		{
		extern void firetruck_init(void);

+0 −3

Original line number	Diff line number	Diff line
		@@ -153,9 +153,6 @@ static int __init sbus_init(void)
		const char *sbus_name = "sbus";
		int num_sbus = 0;

		if (sbus_arch_preinit())
		return 0;

		if (sparc_cpu_model == sun4d)
		sbus_name = "sbi";