summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-01-22 01:20:47 +0400
committerBjorn Helgaas <bhelgaas@google.com>2013-01-26 01:43:22 +0400
commit92d8aff3a317fcd6f78ed9ac13dbbaeae8cb11ed (patch)
treed55492edb9abed37b88b25be4fef30a840d0200a /include/acpi
parente723f0b4f4ecaf3fdd542124b3f99379ab8df757 (diff)
downloadlinux-92d8aff3a317fcd6f78ed9ac13dbbaeae8cb11ed.tar.xz
PCI/ACPI: acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work()
Will need to use it for PCI root bridge hotplug support, so rename *acpiphp* to *acpi* and move to osc.c. Also make kacpi_hotplug_wq static after that. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> CC: Len Brown <lenb@kernel.org> CC: linux-acpi@vger.kernel.org
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h9
-rw-r--r--include/acpi/acpiosxf.h2
2 files changed, 9 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 2c722deb2490..d26c0d7a6d19 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -310,6 +310,15 @@ struct acpi_eject_event {
u32 event;
};
+struct acpi_hp_work {
+ struct work_struct work;
+ acpi_handle handle;
+ u32 type;
+ void *context;
+};
+void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context,
+ void (*func)(struct work_struct *work));
+
extern struct kobject *acpi_kobj;
extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
void acpi_bus_private_data_handler(acpi_handle, void *);
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 43152742b46f..66f1fd70e8c2 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -193,8 +193,6 @@ void acpi_os_fixed_event_count(u32 fixed_event_number);
/*
* Threads and Scheduling
*/
-extern struct workqueue_struct *kacpi_hotplug_wq;
-
acpi_thread_id acpi_os_get_thread_id(void);
acpi_status