Commit 4ec9e289 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-bus' 

* acpi-bus:
  ACPI / bus: Adjust ACPI subsystem initialization for new table loading mode
  ACPI / bus: Make acpi_get_first_physical_node() public
parents 84a78c72 1ef35668

drivers/acpi/bus.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -985,7 +985,8 @@ void __init acpi_early_init(void) 
		goto error0;

		goto error0;

	}

	}





	if (acpi_gbl_group_module_level_code) {

	if (!acpi_gbl_parse_table_as_term_list &&

	    acpi_gbl_group_module_level_code) {

		status = acpi_load_tables();

		status = acpi_load_tables();

		if (ACPI_FAILURE(status)) {

		if (ACPI_FAILURE(status)) {

			printk(KERN_ERR PREFIX

			printk(KERN_ERR PREFIX
@@ -1074,7 +1075,8 @@ static int __init acpi_bus_init(void) 
	status = acpi_ec_ecdt_probe();

	status = acpi_ec_ecdt_probe();

	/* Ignore result. Not having an ECDT is not fatal. */

	/* Ignore result. Not having an ECDT is not fatal. */





	if (!acpi_gbl_group_module_level_code) {

	if (acpi_gbl_parse_table_as_term_list ||

	    !acpi_gbl_group_module_level_code) {

		status = acpi_load_tables();

		status = acpi_load_tables();

		if (ACPI_FAILURE(status)) {

		if (ACPI_FAILURE(status)) {

			printk(KERN_ERR PREFIX

			printk(KERN_ERR PREFIX

drivers/acpi/internal.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,6 @@ bool acpi_device_is_present(struct acpi_device *adev); 
bool acpi_device_is_battery(struct acpi_device *adev);

bool acpi_device_is_battery(struct acpi_device *adev);

bool acpi_device_is_first_physical_node(struct acpi_device *adev,

bool acpi_device_is_first_physical_node(struct acpi_device *adev,

					const struct device *dev);

					const struct device *dev);

struct device *acpi_get_first_physical_node(struct acpi_device *adev);





/* --------------------------------------------------------------------------

/* --------------------------------------------------------------------------

                     Device Matching and Notification

                     Device Matching and Notification

include/linux/acpi.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,8 @@ static inline const char *acpi_dev_name(struct acpi_device *adev) 
	return dev_name(&adev->dev);

	return dev_name(&adev->dev);

}

}





struct device *acpi_get_first_physical_node(struct acpi_device *adev);



enum acpi_irq_model_id {

enum acpi_irq_model_id {

	ACPI_IRQ_MODEL_PIC = 0,

	ACPI_IRQ_MODEL_PIC = 0,

	ACPI_IRQ_MODEL_IOAPIC,

	ACPI_IRQ_MODEL_IOAPIC,
@@ -634,6 +636,11 @@ static inline const char *acpi_dev_name(struct acpi_device *adev) 
	return NULL;

	return NULL;

}

}





static inline struct device *acpi_get_first_physical_node(struct acpi_device *adev)

{

	return NULL;

}



static inline void acpi_early_init(void) { }

static inline void acpi_early_init(void) { }

static inline void acpi_subsystem_init(void) { }

static inline void acpi_subsystem_init(void) { }