diff options
author | Zhang Rui <rui.zhang@intel.com> | 2006-12-07 07:57:10 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-15 23:38:35 -0500 |
commit | ae8433324be16673c75951986dcf85f29c090557 (patch) | |
tree | c762438e6d685f3f106a5c2bc9fc93246bfb47ff /include/acpi | |
parent | db3e1cc3257758d8a694d0a6ab29f109fb019853 (diff) |
ACPI: Set fake hid for non-PNPID ACPI devices
We do this mainly because:
1. hid is used to match ACPI devices and drivers.
.match method which is incompatible to driver model
can be deleted from acpi_driver.ops then.
2. As the .uevent method mark ACPI drivers by PNPID,
fake hid is set to non-PNPID devices so that udev script
can load the right ACPI driver by looking for
"HWID = " or "COMPTID = ".
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 6 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 58dc8f651861..a6b4037beeae 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -97,8 +97,6 @@ typedef int (*acpi_op_resume) (struct acpi_device * device); | |||
97 | typedef int (*acpi_op_scan) (struct acpi_device * device); | 97 | typedef int (*acpi_op_scan) (struct acpi_device * device); |
98 | typedef int (*acpi_op_bind) (struct acpi_device * device); | 98 | typedef int (*acpi_op_bind) (struct acpi_device * device); |
99 | typedef int (*acpi_op_unbind) (struct acpi_device * device); | 99 | typedef int (*acpi_op_unbind) (struct acpi_device * device); |
100 | typedef int (*acpi_op_match) (struct acpi_device * device, | ||
101 | struct acpi_driver * driver); | ||
102 | typedef int (*acpi_op_shutdown) (struct acpi_device * device); | 100 | typedef int (*acpi_op_shutdown) (struct acpi_device * device); |
103 | 101 | ||
104 | struct acpi_bus_ops { | 102 | struct acpi_bus_ops { |
@@ -112,9 +110,8 @@ struct acpi_bus_ops { | |||
112 | u32 acpi_op_scan:1; | 110 | u32 acpi_op_scan:1; |
113 | u32 acpi_op_bind:1; | 111 | u32 acpi_op_bind:1; |
114 | u32 acpi_op_unbind:1; | 112 | u32 acpi_op_unbind:1; |
115 | u32 acpi_op_match:1; | ||
116 | u32 acpi_op_shutdown:1; | 113 | u32 acpi_op_shutdown:1; |
117 | u32 reserved:20; | 114 | u32 reserved:21; |
118 | }; | 115 | }; |
119 | 116 | ||
120 | struct acpi_device_ops { | 117 | struct acpi_device_ops { |
@@ -128,7 +125,6 @@ struct acpi_device_ops { | |||
128 | acpi_op_scan scan; | 125 | acpi_op_scan scan; |
129 | acpi_op_bind bind; | 126 | acpi_op_bind bind; |
130 | acpi_op_unbind unbind; | 127 | acpi_op_unbind unbind; |
131 | acpi_op_match match; | ||
132 | acpi_op_shutdown shutdown; | 128 | acpi_op_shutdown shutdown; |
133 | }; | 129 | }; |
134 | 130 | ||
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 6a5bdcefec64..be67750ec88b 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -43,6 +43,8 @@ | |||
43 | #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" | 43 | #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" |
44 | #define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB" | 44 | #define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB" |
45 | 45 | ||
46 | #define ACPI_VIDEO_HID "ACPI_VID" | ||
47 | #define ACPI_PCI_BRIDGE_HID "ACPI_PCI" | ||
46 | /* -------------------------------------------------------------------------- | 48 | /* -------------------------------------------------------------------------- |
47 | PCI | 49 | PCI |
48 | -------------------------------------------------------------------------- */ | 50 | -------------------------------------------------------------------------- */ |