staging: unisys: visorbus: move bus_device_info_init to visorbus_main.c

The function bus_device_info_init was defined in visorbus_private.h. The
only file that uses it is visorbus_main.c so move the function into the .c
file instead.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index fc841b1e1902d7c67fdcd658c3a79b8a2cf6eac7..bb1b6a0bf5de161af7d49ea526a366b5e9d018f4 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -763,6 +763,22 @@ write_vbus_dev_info(struct visorchannel *chan,
        visorchannel_write(chan, off, info, sizeof(*info));
 }
 
+static void bus_device_info_init(
+               struct ultra_vbus_deviceinfo *bus_device_info_ptr,
+               const char *dev_type, const char *drv_name)
+{
+       memset(bus_device_info_ptr, 0, sizeof(struct ultra_vbus_deviceinfo));
+       snprintf(bus_device_info_ptr->devtype,
+                sizeof(bus_device_info_ptr->devtype),
+                "%s", (dev_type) ? dev_type : "unknownType");
+       snprintf(bus_device_info_ptr->drvname,
+                sizeof(bus_device_info_ptr->drvname),
+                "%s", (drv_name) ? drv_name : "unknownDriver");
+       snprintf(bus_device_info_ptr->infostrs,
+                sizeof(bus_device_info_ptr->infostrs), "kernel ver. %s",
+                utsname()->release);
+}
+
 /*
  * fix_vbus_dev_info() - for a child device just created on a client bus, fill
  *                       in information about the driver that is controlling

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index eb8b3ec150d54a479802a3e9c92575ea95a7cb18..fdccfcb0d1b13983201729dde6853490715de432 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -27,22 +27,6 @@
  * command line
  */
 
-static inline void bus_device_info_init(
-               struct ultra_vbus_deviceinfo *bus_device_info_ptr,
-               const char *dev_type, const char *drv_name)
-{
-       memset(bus_device_info_ptr, 0, sizeof(struct ultra_vbus_deviceinfo));
-       snprintf(bus_device_info_ptr->devtype,
-                sizeof(bus_device_info_ptr->devtype),
-                "%s", (dev_type) ? dev_type : "unknownType");
-       snprintf(bus_device_info_ptr->drvname,
-                sizeof(bus_device_info_ptr->drvname),
-                "%s", (drv_name) ? drv_name : "unknownDriver");
-       snprintf(bus_device_info_ptr->infostrs,
-                sizeof(bus_device_info_ptr->infostrs), "kernel ver. %s",
-                utsname()->release);
-}
-
 void chipset_bus_create(struct visor_device *bus_info);
 void chipset_bus_destroy(struct visor_device *bus_info);
 void chipset_device_create(struct visor_device *dev_info);