Commit 8c8eb78f authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI: autoload modules - ACPICA modifications 



Define standardized HIDs - Rename current acpi_device_id to acpica_device_id

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent f695baf2

drivers/acpi/events/evrgnini.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static u8 acpi_ev_match_pci_root_bridge(char *id) 
static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)

{

	acpi_status status;

	struct acpi_device_id hid;

	struct acpica_device_id hid;

	struct acpi_compatible_id_list *cid;

	acpi_native_uint i;

drivers/acpi/namespace/nsxfeval.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, 
	acpi_status status;

	struct acpi_namespace_node *node;

	u32 flags;

	struct acpi_device_id hid;

	struct acpica_device_id hid;

	struct acpi_compatible_id_list *cid;

	acpi_native_uint i;

drivers/acpi/utilities/uteval.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ acpi_ut_copy_id_string(char *destination, char *source, acpi_size max_length) 


acpi_status

acpi_ut_execute_HID(struct acpi_namespace_node *device_node,

		    struct acpi_device_id *hid)

		    struct acpica_device_id *hid)

{

	union acpi_operand_object *obj_desc;

	acpi_status status;
@@ -609,7 +609,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node, 


acpi_status

acpi_ut_execute_UID(struct acpi_namespace_node *device_node,

		    struct acpi_device_id *uid)

		    struct acpica_device_id *uid)

{

	union acpi_operand_object *obj_desc;

	acpi_status status;

include/acpi/acpi_bus.h

+3 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct acpi_device_ops { 
struct acpi_driver {

	char name[80];

	char class[80];

	char *ids;		/* Supported Hardware IDs */

	const struct acpi_device_id *ids; /* Supported Hardware IDs */

	struct acpi_device_ops ops;

	struct device_driver drv;

	struct module *owner;
@@ -341,7 +341,8 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, 
int acpi_bus_trim(struct acpi_device *start, int rmdevice);

int acpi_bus_start(struct acpi_device *device);

acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);

int acpi_match_ids(struct acpi_device *device, char *ids);

int acpi_match_device_ids(struct acpi_device *device,

			  const struct acpi_device_id *ids);

int acpi_create_dir(struct acpi_device *);

void acpi_remove_dir(struct acpi_device *);

include/acpi/acpi_drivers.h

+13 −8
Original line number Diff line number Diff line
@@ -34,16 +34,21 @@ 
#define ACPI_BUS_COMPONENT		0x00010000

#define ACPI_SYSTEM_COMPONENT		0x02000000



/* _HID definitions */

/*

 * _HID definitions

 * HIDs must conform to ACPI spec(6.1.4)

 * Linux specific HIDs do not apply to this and begin with LNX:

 */



#define ACPI_POWER_HID			"power_resource"

#define ACPI_POWER_HID			"LNXPOWER"

#define ACPI_PROCESSOR_HID		"ACPI0007"

#define ACPI_SYSTEM_HID			"acpi_system"

#define ACPI_THERMAL_HID		"thermal"

#define ACPI_BUTTON_HID_POWERF		"button_power"

#define ACPI_BUTTON_HID_SLEEPF		"button_sleep"

#define ACPI_VIDEO_HID			"video"

#define ACPI_BAY_HID			"bay"

#define ACPI_SYSTEM_HID			"LNXSYSTM"

#define ACPI_THERMAL_HID		"LNXTHERM"

#define ACPI_BUTTON_HID_POWERF		"LNXPWRBN"

#define ACPI_BUTTON_HID_SLEEPF		"LNXSLPBN"

#define ACPI_VIDEO_HID			"LNXVIDEO"

#define ACPI_BAY_HID			"LNXIOBAY"



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

                                       PCI

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