diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 9cfd5b1a48eb..c6fa5e023bc7 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -91,7 +91,8 @@ typedef int (*acpi_op_remove) (struct acpi_device * device, int type); | |||
91 | typedef int (*acpi_op_lock) (struct acpi_device * device, int type); | 91 | typedef int (*acpi_op_lock) (struct acpi_device * device, int type); |
92 | typedef int (*acpi_op_start) (struct acpi_device * device); | 92 | typedef int (*acpi_op_start) (struct acpi_device * device); |
93 | typedef int (*acpi_op_stop) (struct acpi_device * device, int type); | 93 | typedef int (*acpi_op_stop) (struct acpi_device * device, int type); |
94 | typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state); | 94 | typedef int (*acpi_op_suspend) (struct acpi_device * device, |
95 | pm_message_t state); | ||
95 | typedef int (*acpi_op_resume) (struct acpi_device * device); | 96 | typedef int (*acpi_op_resume) (struct acpi_device * device); |
96 | typedef int (*acpi_op_scan) (struct acpi_device * device); | 97 | typedef int (*acpi_op_scan) (struct acpi_device * device); |
97 | typedef int (*acpi_op_bind) (struct acpi_device * device); | 98 | typedef int (*acpi_op_bind) (struct acpi_device * device); |
@@ -296,7 +297,7 @@ struct acpi_device { | |||
296 | void *driver_data; | 297 | void *driver_data; |
297 | struct device dev; | 298 | struct device dev; |
298 | struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ | 299 | struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ |
299 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ | 300 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ |
300 | }; | 301 | }; |
301 | 302 | ||
302 | #define acpi_driver_data(d) ((d)->driver_data) | 303 | #define acpi_driver_data(d) ((d)->driver_data) |
@@ -338,7 +339,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | |||
338 | acpi_handle handle, int type); | 339 | acpi_handle handle, int type); |
339 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | 340 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); |
340 | int acpi_bus_start(struct acpi_device *device); | 341 | int acpi_bus_start(struct acpi_device *device); |
341 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd); | 342 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |
342 | int acpi_match_ids(struct acpi_device *device, char *ids); | 343 | int acpi_match_ids(struct acpi_device *device, char *ids); |
343 | int acpi_create_dir(struct acpi_device *); | 344 | int acpi_create_dir(struct acpi_device *); |
344 | void acpi_remove_dir(struct acpi_device *); | 345 | void acpi_remove_dir(struct acpi_device *); |
@@ -363,6 +364,6 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer); | |||
363 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 364 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
364 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 365 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
365 | 366 | ||
366 | #endif /* CONFIG_ACPI */ | 367 | #endif /* CONFIG_ACPI */ |
367 | 368 | ||
368 | #endif /*__ACPI_BUS_H__*/ | 369 | #endif /*__ACPI_BUS_H__*/ |