diff options
author | Patrick Mochel <mochel@linux.intel.com> | 2006-12-07 07:56:27 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-15 23:38:34 -0500 |
commit | 5d9464a46918ced087c351a10f38cee95725f85b (patch) | |
tree | acb45582f9c43a867a60cc5fa8ae2c6197dc1d2d /drivers/acpi/battery.c | |
parent | d43ec68e9837dfa6618ab473622683fdbf6e68a9 (diff) |
ACPI: add ACPI bus_type for driver model
Add ACPI bus_type for Linux driver model.
1. .shutdown method is added into acpi_driver.ops
needed by bus_type operations.
2. remove useless parameter 'int state' in .resume method.
3. change parameter 'int state'
to 'pm_message_t state' in .suspend method.
Note: The new .uevent method mark ACPI drivers by PNPID instead of by name.
Udev script needs to look for "HWID=" or "COMPTID=" to load
ACPI drivers as a result.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r-- | drivers/acpi/battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 026e40755cdd..07c3c276ad34 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -64,7 +64,7 @@ extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); | |||
64 | 64 | ||
65 | static int acpi_battery_add(struct acpi_device *device); | 65 | static int acpi_battery_add(struct acpi_device *device); |
66 | static int acpi_battery_remove(struct acpi_device *device, int type); | 66 | static int acpi_battery_remove(struct acpi_device *device, int type); |
67 | static int acpi_battery_resume(struct acpi_device *device, int status); | 67 | static int acpi_battery_resume(struct acpi_device *device); |
68 | 68 | ||
69 | static struct acpi_driver acpi_battery_driver = { | 69 | static struct acpi_driver acpi_battery_driver = { |
70 | .name = ACPI_BATTERY_DRIVER_NAME, | 70 | .name = ACPI_BATTERY_DRIVER_NAME, |
@@ -756,7 +756,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) | |||
756 | } | 756 | } |
757 | 757 | ||
758 | /* this is needed to learn about changes made in suspended state */ | 758 | /* this is needed to learn about changes made in suspended state */ |
759 | static int acpi_battery_resume(struct acpi_device *device, int state) | 759 | static int acpi_battery_resume(struct acpi_device *device) |
760 | { | 760 | { |
761 | struct acpi_battery *battery; | 761 | struct acpi_battery *battery; |
762 | 762 | ||