Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4505a201 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPI: Drop ACPI_NO_HARDWARE_INIT 



ACPI_NO_HARDWARE_INIT is only used by acpi_early_init() and
acpi_bus_init() when calling acpi_enable_subsystem(), but
acpi_enable_subsystem() doesn't check that flag, so it can be
dropped.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 581de59e

drivers/acpi/bus.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -911,10 +911,7 @@ void __init acpi_early_init(void) 
	}

	}

#endif

#endif





	status =

	status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE);

	    acpi_enable_subsystem(~

				  (ACPI_NO_HARDWARE_INIT |

				   ACPI_NO_ACPI_ENABLE));

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX "Unable to enable ACPI\n");

		printk(KERN_ERR PREFIX "Unable to enable ACPI\n");

		goto error0;

		goto error0;
@@ -935,8 +932,7 @@ static int __init acpi_bus_init(void) 




	acpi_os_initialize1();

	acpi_os_initialize1();





	status =

	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);

	    acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		printk(KERN_ERR PREFIX

		       "Unable to start the ACPI Interpreter\n");

		       "Unable to start the ACPI Interpreter\n");

include/acpi/actypes.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -470,7 +470,6 @@ typedef u64 acpi_integer; 
 */

 */

#define ACPI_FULL_INITIALIZATION        0x00

#define ACPI_FULL_INITIALIZATION        0x00

#define ACPI_NO_ADDRESS_SPACE_INIT      0x01

#define ACPI_NO_ADDRESS_SPACE_INIT      0x01

#define ACPI_NO_HARDWARE_INIT           0x02

#define ACPI_NO_EVENT_INIT              0x04

#define ACPI_NO_EVENT_INIT              0x04

#define ACPI_NO_HANDLER_INIT            0x08

#define ACPI_NO_HANDLER_INIT            0x08

#define ACPI_NO_ACPI_ENABLE             0x10

#define ACPI_NO_ACPI_ENABLE             0x10