diff options
-rw-r--r-- | drivers/acpi/events/evrgnini.c | 2 | ||||
-rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 2 | ||||
-rw-r--r-- | drivers/acpi/utilities/uteval.c | 4 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 5 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 21 | ||||
-rw-r--r-- | include/acpi/actypes.h | 6 | ||||
-rw-r--r-- | include/acpi/acutils.h | 4 |
7 files changed, 25 insertions, 19 deletions
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c index 23ee7bc4a705..b1aaa0e84588 100644 --- a/drivers/acpi/events/evrgnini.c +++ b/drivers/acpi/events/evrgnini.c | |||
@@ -378,7 +378,7 @@ static u8 acpi_ev_match_pci_root_bridge(char *id) | |||
378 | static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node) | 378 | static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node) |
379 | { | 379 | { |
380 | acpi_status status; | 380 | acpi_status status; |
381 | struct acpi_device_id hid; | 381 | struct acpica_device_id hid; |
382 | struct acpi_compatible_id_list *cid; | 382 | struct acpi_compatible_id_list *cid; |
383 | acpi_native_uint i; | 383 | acpi_native_uint i; |
384 | 384 | ||
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index be4f2899de74..ab65b2c2560e 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c | |||
@@ -440,7 +440,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, | |||
440 | acpi_status status; | 440 | acpi_status status; |
441 | struct acpi_namespace_node *node; | 441 | struct acpi_namespace_node *node; |
442 | u32 flags; | 442 | u32 flags; |
443 | struct acpi_device_id hid; | 443 | struct acpica_device_id hid; |
444 | struct acpi_compatible_id_list *cid; | 444 | struct acpi_compatible_id_list *cid; |
445 | acpi_native_uint i; | 445 | acpi_native_uint i; |
446 | 446 | ||
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c index f112af433e36..0042b7e78b26 100644 --- a/drivers/acpi/utilities/uteval.c +++ b/drivers/acpi/utilities/uteval.c | |||
@@ -407,7 +407,7 @@ acpi_ut_copy_id_string(char *destination, char *source, acpi_size max_length) | |||
407 | 407 | ||
408 | acpi_status | 408 | acpi_status |
409 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, | 409 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, |
410 | struct acpi_device_id *hid) | 410 | struct acpica_device_id *hid) |
411 | { | 411 | { |
412 | union acpi_operand_object *obj_desc; | 412 | union acpi_operand_object *obj_desc; |
413 | acpi_status status; | 413 | acpi_status status; |
@@ -609,7 +609,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node, | |||
609 | 609 | ||
610 | acpi_status | 610 | acpi_status |
611 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, | 611 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, |
612 | struct acpi_device_id *uid) | 612 | struct acpica_device_id *uid) |
613 | { | 613 | { |
614 | union acpi_operand_object *obj_desc; | 614 | union acpi_operand_object *obj_desc; |
615 | acpi_status status; | 615 | acpi_status status; |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5e3dcf3299bf..3f2a22b5dc61 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -131,7 +131,7 @@ struct acpi_device_ops { | |||
131 | struct acpi_driver { | 131 | struct acpi_driver { |
132 | char name[80]; | 132 | char name[80]; |
133 | char class[80]; | 133 | char class[80]; |
134 | char *ids; /* Supported Hardware IDs */ | 134 | const struct acpi_device_id *ids; /* Supported Hardware IDs */ |
135 | struct acpi_device_ops ops; | 135 | struct acpi_device_ops ops; |
136 | struct device_driver drv; | 136 | struct device_driver drv; |
137 | struct module *owner; | 137 | struct module *owner; |
@@ -341,7 +341,8 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | |||
341 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | 341 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); |
342 | int acpi_bus_start(struct acpi_device *device); | 342 | int acpi_bus_start(struct acpi_device *device); |
343 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); | 343 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |
344 | int acpi_match_ids(struct acpi_device *device, char *ids); | 344 | int acpi_match_device_ids(struct acpi_device *device, |
345 | const struct acpi_device_id *ids); | ||
345 | int acpi_create_dir(struct acpi_device *); | 346 | int acpi_create_dir(struct acpi_device *); |
346 | void acpi_remove_dir(struct acpi_device *); | 347 | void acpi_remove_dir(struct acpi_device *); |
347 | 348 | ||
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 553515912c0b..c348ff48e669 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -34,16 +34,21 @@ | |||
34 | #define ACPI_BUS_COMPONENT 0x00010000 | 34 | #define ACPI_BUS_COMPONENT 0x00010000 |
35 | #define ACPI_SYSTEM_COMPONENT 0x02000000 | 35 | #define ACPI_SYSTEM_COMPONENT 0x02000000 |
36 | 36 | ||
37 | /* _HID definitions */ | 37 | /* |
38 | * _HID definitions | ||
39 | * HIDs must conform to ACPI spec(6.1.4) | ||
40 | * Linux specific HIDs do not apply to this and begin with LNX: | ||
41 | */ | ||
38 | 42 | ||
39 | #define ACPI_POWER_HID "power_resource" | 43 | #define ACPI_POWER_HID "LNXPOWER" |
40 | #define ACPI_PROCESSOR_HID "ACPI0007" | 44 | #define ACPI_PROCESSOR_HID "ACPI0007" |
41 | #define ACPI_SYSTEM_HID "acpi_system" | 45 | #define ACPI_SYSTEM_HID "LNXSYSTM" |
42 | #define ACPI_THERMAL_HID "thermal" | 46 | #define ACPI_THERMAL_HID "LNXTHERM" |
43 | #define ACPI_BUTTON_HID_POWERF "button_power" | 47 | #define ACPI_BUTTON_HID_POWERF "LNXPWRBN" |
44 | #define ACPI_BUTTON_HID_SLEEPF "button_sleep" | 48 | #define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN" |
45 | #define ACPI_VIDEO_HID "video" | 49 | #define ACPI_VIDEO_HID "LNXVIDEO" |
46 | #define ACPI_BAY_HID "bay" | 50 | #define ACPI_BAY_HID "LNXIOBAY" |
51 | |||
47 | /* -------------------------------------------------------------------------- | 52 | /* -------------------------------------------------------------------------- |
48 | PCI | 53 | PCI |
49 | -------------------------------------------------------------------------- */ | 54 | -------------------------------------------------------------------------- */ |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index fe8abc276437..e73a38939120 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -809,7 +809,7 @@ acpi_status(*acpi_walk_callback) (acpi_handle obj_handle, | |||
809 | 809 | ||
810 | /* Common string version of device HIDs and UIDs */ | 810 | /* Common string version of device HIDs and UIDs */ |
811 | 811 | ||
812 | struct acpi_device_id { | 812 | struct acpica_device_id { |
813 | char value[ACPI_DEVICE_ID_LENGTH]; | 813 | char value[ACPI_DEVICE_ID_LENGTH]; |
814 | }; | 814 | }; |
815 | 815 | ||
@@ -859,8 +859,8 @@ struct acpi_device_info { | |||
859 | u32 valid; /* Indicates which fields below are valid */ | 859 | u32 valid; /* Indicates which fields below are valid */ |
860 | u32 current_status; /* _STA value */ | 860 | u32 current_status; /* _STA value */ |
861 | acpi_integer address; /* _ADR value if any */ | 861 | acpi_integer address; /* _ADR value if any */ |
862 | struct acpi_device_id hardware_id; /* _HID value if any */ | 862 | struct acpica_device_id hardware_id; /* _HID value if any */ |
863 | struct acpi_device_id unique_id; /* _UID value if any */ | 863 | struct acpica_device_id unique_id; /* _UID value if any */ |
864 | u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */ | 864 | u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */ |
865 | struct acpi_compatible_id_list compatibility_id; /* List of _CIDs if any */ | 865 | struct acpi_compatible_id_list compatibility_id; /* List of _CIDs if any */ |
866 | }; | 866 | }; |
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h index a87ef1c8d46b..a2918547c73f 100644 --- a/include/acpi/acutils.h +++ b/include/acpi/acutils.h | |||
@@ -354,7 +354,7 @@ acpi_ut_evaluate_numeric_object(char *object_name, | |||
354 | 354 | ||
355 | acpi_status | 355 | acpi_status |
356 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, | 356 | acpi_ut_execute_HID(struct acpi_namespace_node *device_node, |
357 | struct acpi_device_id *hid); | 357 | struct acpica_device_id *hid); |
358 | 358 | ||
359 | acpi_status | 359 | acpi_status |
360 | acpi_ut_execute_CID(struct acpi_namespace_node *device_node, | 360 | acpi_ut_execute_CID(struct acpi_namespace_node *device_node, |
@@ -366,7 +366,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, | |||
366 | 366 | ||
367 | acpi_status | 367 | acpi_status |
368 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, | 368 | acpi_ut_execute_UID(struct acpi_namespace_node *device_node, |
369 | struct acpi_device_id *uid); | 369 | struct acpica_device_id *uid); |
370 | 370 | ||
371 | acpi_status | 371 | acpi_status |
372 | acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest); | 372 | acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest); |