staging: unisys: delbusdevices() doesn't need to be inline

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index a3fe8b7de341de95836cc685ccc8484fbd613159..1d66c3766c42d2cfa9c17199e7319ff2e1bfd2ca 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -91,18 +91,6 @@ struct visorchipset_device_info {
        void *bus_driver_context;
 };
 
-static inline void delbusdevices(struct list_head *list, u32 bus_no)
-{
-       struct visorchipset_device_info *p, *tmp;
-
-       list_for_each_entry_safe(p, tmp, list, entry) {
-               if (p->bus_no == bus_no) {
-                       list_del(&p->entry);
-                       kfree(p);
-               }
-       }
-}
-
 /** Attributes for a particular Supervisor bus.
  *  (For a service partition acting as the server for buses/devices, there
  *  is a 1-to-1 relationship between busses and guest partitions.)

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index d1f0d18da10e6262eff96e49008e30dd6041baf7..9f5c539d959b9ddb0b26521c49d7387e70c1740b 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -552,6 +552,18 @@ device_find(struct list_head *list, u32 bus_no, u32 dev_no)
        return NULL;
 }
 
+static void busdevices_del(struct list_head *list, u32 bus_no)
+{
+       struct visorchipset_device_info *p, *tmp;
+
+       list_for_each_entry_safe(p, tmp, list, entry) {
+               if (p->bus_no == bus_no) {
+                       list_del(&p->entry);
+                       kfree(p);
+               }
+       }
+}
+
 static u8
 check_chipset_events(void)
 {
@@ -810,7 +822,7 @@ bus_responder(enum controlvm_id cmd_id, u32 bus_no, int response)
                if ((cmd_id == CONTROLVM_BUS_CREATE) &&
                    (response != (-CONTROLVM_RESP_ERROR_ALREADY_DONE)))
                        /* undo the row we just created... */
-                       delbusdevices(&dev_info_list, bus_no);
+                       busdevices_del(&dev_info_list, bus_no);
        } else {
                if (cmd_id == CONTROLVM_BUS_CREATE)
                        p->state.created = 1;
@@ -826,7 +838,7 @@ bus_responder(enum controlvm_id cmd_id, u32 bus_no, int response)
        p->pending_msg_hdr.id = CONTROLVM_INVALID;
        if (need_clear) {
                bus_info_clear(p);
-               delbusdevices(&dev_info_list, bus_no);
+               busdevices_del(&dev_info_list, bus_no);
        }
 }