Commit 91ab377b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-tables' and 'acpi-general' 

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy

* acpi-general:
  ACPI: Add acpi_bus_attach_private_data() to attach data to ACPI handle
parents 26f8784e 73577d1d 72013795

drivers/acpi/bus.c

+31 −4
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ struct proc_dir_entry *acpi_root_dir; 
EXPORT_SYMBOL(acpi_root_dir);



#ifdef CONFIG_X86

#ifdef CONFIG_ACPI_CUSTOM_DSDT

static inline int set_copy_dsdt(const struct dmi_system_id *id)

{

	return 0;

}

#else

static int set_copy_dsdt(const struct dmi_system_id *id)

{

	printk(KERN_NOTICE "%s detected - "
@@ -59,6 +65,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id) 
	acpi_gbl_copy_dsdt_locally = 1;

	return 0;

}

#endif



static struct dmi_system_id dsdt_dmi_table[] __initdata = {

	/*
@@ -132,6 +139,21 @@ void acpi_bus_private_data_handler(acpi_handle handle, 
}

EXPORT_SYMBOL(acpi_bus_private_data_handler);



int acpi_bus_attach_private_data(acpi_handle handle, void *data)

{

	acpi_status status;



	status = acpi_attach_data(handle,

			acpi_bus_private_data_handler, data);

	if (ACPI_FAILURE(status)) {

		acpi_handle_debug(handle, "Error attaching device data\n");

		return -ENODEV;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(acpi_bus_attach_private_data);



int acpi_bus_get_private_data(acpi_handle handle, void **data)

{

	acpi_status status;
@@ -140,15 +162,20 @@ int acpi_bus_get_private_data(acpi_handle handle, void **data) 
		return -EINVAL;



	status = acpi_get_data(handle, acpi_bus_private_data_handler, data);

	if (ACPI_FAILURE(status) || !*data) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",

				handle));

	if (ACPI_FAILURE(status)) {

		acpi_handle_debug(handle, "No context for object\n");

		return -ENODEV;

	}



	return 0;

}

EXPORT_SYMBOL(acpi_bus_get_private_data);

EXPORT_SYMBOL_GPL(acpi_bus_get_private_data);



void acpi_bus_detach_private_data(acpi_handle handle)

{

	acpi_detach_data(handle, acpi_bus_private_data_handler);

}

EXPORT_SYMBOL_GPL(acpi_bus_detach_private_data);



void acpi_bus_no_hotplug(acpi_handle handle)

{

include/acpi/acpi_bus.h

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,8 @@ extern struct kobject *acpi_kobj; 
extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);

void acpi_bus_private_data_handler(acpi_handle, void *);

int acpi_bus_get_private_data(acpi_handle, void **);

int acpi_bus_attach_private_data(acpi_handle, void *);

void acpi_bus_detach_private_data(acpi_handle);

void acpi_bus_no_hotplug(acpi_handle handle);

extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32);

extern int register_acpi_notifier(struct notifier_block *);