x86, ACPI: delete acpi_boot_table_init() return value (8558e394) · Commits · 戴 / test

arch/x86/kernel/acpi/boot.c

+6 −16

Original line number	Diff line number	Diff line
		@@ -1529,16 +1529,10 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
		* if acpi_blacklisted() acpi_disabled = 1;
		* acpi_irq_model=...
		* ...
		*
		* return value: (currently ignored)
		* 0: success
		* !0: failure
		*/

		int __init acpi_boot_table_init(void)
		void __init acpi_boot_table_init(void)
		{
		int error;

		dmi_check_system(acpi_dmi_table);

		/*
		@@ -1546,15 +1540,14 @@ int __init acpi_boot_table_init(void)
		* One exception: acpi=ht continues far enough to enumerate LAPICs
		*/
		if (acpi_disabled && !acpi_ht)
		return 1;
		return;

		/*
		* Initialize the ACPI boot-time table parser.
		*/
		error = acpi_table_init();
		if (error) {
		if (acpi_table_init()) {
		disable_acpi();
		return error;
		return;
		}

		acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);
		@@ -1562,18 +1555,15 @@ int __init acpi_boot_table_init(void)
		/*
		* blacklist may disable ACPI entirely
		*/
		error = acpi_blacklisted();
		if (error) {
		if (acpi_blacklisted()) {
		if (acpi_force) {
		printk(KERN_WARNING PREFIX "acpi=force override\n");
		} else {
		printk(KERN_WARNING PREFIX "Disabling ACPI support\n");
		disable_acpi();
		return error;
		return;
		}
		}

		return 0;
		}

		int __init early_acpi_boot_init(void)

+3 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
		void __acpi_unmap_table(char *map, unsigned long size);
		int early_acpi_boot_init(void);
		int acpi_boot_init (void);
		int acpi_boot_table_init (void);
		void acpi_boot_table_init (void);
		int acpi_mps_check (void);
		int acpi_numa_init (void);

		@@ -321,9 +321,9 @@ static inline int acpi_boot_init(void)
		return 0;
		}

		static inline int acpi_boot_table_init(void)
		static inline void acpi_boot_table_init(void)
		{
		return 0;
		return;
		}

		static inline int acpi_mps_check(void)