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

1 files changed, 6 insertions, 36 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index b94879d20630..bf338d2ff371 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1203,34 +1203,6 @@ check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK ;
 }
 
-struct acpiphp_hp_work {
-        struct work_struct work;
-        acpi_handle handle;
-        u32 type;
-        void *context;
-};
-
-static void alloc_acpiphp_hp_work(acpi_handle handle, u32 type,
-                                  void *context,
-                                  void (*func)(struct work_struct *work))
-{
-        struct acpiphp_hp_work *hp_work;
-        int ret;
-
-        hp_work = kmalloc(sizeof(*hp_work), GFP_KERNEL);
-        if (!hp_work)
-                return;
-
-        hp_work->handle = handle;
-        hp_work->type = type;
-        hp_work->context = context;
-
-        INIT_WORK(&hp_work->work, func);
-        ret = queue_work(kacpi_hotplug_wq, &hp_work->work);
-        if (!ret)
-                kfree(hp_work);
-}
-
 static void _handle_hotplug_event_bridge(struct work_struct *work)
 {
         struct acpiphp_bridge *bridge;
@@ -1239,11 +1211,11 @@ static void _handle_hotplug_event_bridge(struct work_struct *work)
                                       .pointer = objname };
         struct acpi_device *device;
         int num_sub_bridges = 0;
-        struct acpiphp_hp_work *hp_work;
+        struct acpi_hp_work *hp_work;
         acpi_handle handle;
         u32 type;
 
-        hp_work = container_of(work, struct acpiphp_hp_work, work);
+        hp_work = container_of(work, struct acpi_hp_work, work);
         handle = hp_work->handle;
         type = hp_work->type;
 
@@ -1346,8 +1318,7 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type,
          * For now just re-add this work to the kacpi_hotplug_wq so we
          * don't deadlock on hotplug actions.
          */
-        alloc_acpiphp_hp_work(handle, type, context,
-                              _handle_hotplug_event_bridge);
+        alloc_acpi_hp_work(handle, type, context, _handle_hotplug_event_bridge);
 }
 
 static void _handle_hotplug_event_func(struct work_struct *work)
@@ -1356,12 +1327,12 @@ static void _handle_hotplug_event_func(struct work_struct *work)
         char objname[64];
         struct acpi_buffer buffer = { .length = sizeof(objname),
                                       .pointer = objname };
-        struct acpiphp_hp_work *hp_work;
+        struct acpi_hp_work *hp_work;
         acpi_handle handle;
         u32 type;
         void *context;
 
-        hp_work = container_of(work, struct acpiphp_hp_work, work);
+        hp_work = container_of(work, struct acpi_hp_work, work);
         handle = hp_work->handle;
         type = hp_work->type;
         context = hp_work->context;
@@ -1422,8 +1393,7 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type,
          * For now just re-add this work to the kacpi_hotplug_wq so we
          * don't deadlock on hotplug actions.
          */
-        alloc_acpiphp_hp_work(handle, type, context,
-                              _handle_hotplug_event_func);
+        alloc_acpi_hp_work(handle, type, context, _handle_hotplug_event_func);
 }
 
 static acpi_status