staging: unisys: visorbus: move vbuschannel_print_devinfo from .h to .c file

Move vbuschannel_print_devinfo from vbuchannel.h to visorbus_main.c since
it is only referenced in visorbus_main.c. Since it is in a .c file, get
rid of the inline for it.

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/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index 447fef25c11b9eede2631b9d8bd6c60a84c3c011..4ef70fd90a2d39f39c97ce329af0f7666bcbc071 100644 (file)
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -64,41 +64,6 @@ struct ultra_vbus_deviceinfo {
        u8 reserved[128];       /* pad size to 256 bytes */
 } __packed;
 
-/*
- * vbuschannel_print_devinfo() - format a struct ultra_vbus_deviceinfo
- *                               and write it to a seq_file
- * @devinfo: the struct ultra_vbus_deviceinfo to format
- * @seq: seq_file to write to
- * @devix: the device index to be included in the output data, or -1 if no
- *         device index is to be included
- *
- * Reads @devInfo, and writes it in human-readable notation to @seq.
- */
-static inline void
-vbuschannel_print_devinfo(struct ultra_vbus_deviceinfo *devinfo,
-                         struct seq_file *seq, int devix)
-{
-       if (!isprint(devinfo->devtype[0]))
-               return; /* uninitialized vbus device entry */
-
-       if (devix >= 0)
-               seq_printf(seq, "[%d]", devix);
-       else
-               /* vbus device entry is for bus or chipset */
-               seq_puts(seq, "   ");
-
-       /*
-        * Note: because the s-Par back-end is free to scribble in this area,
-        * we never assume '\0'-termination.
-        */
-       seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->devtype),
-                  (int)sizeof(devinfo->devtype), devinfo->devtype);
-       seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->drvname),
-                  (int)sizeof(devinfo->drvname), devinfo->drvname);
-       seq_printf(seq, "%.*s\n", (int)sizeof(devinfo->infostrs),
-                  devinfo->infostrs);
-}
-
 struct spar_vbus_headerinfo {
        u32 struct_bytes;       /* size of this struct in bytes */
        u32 device_info_struct_bytes;   /* sizeof(ULTRA_VBUS_DEVICEINFO) */

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 9ef91c73dc0f66b95af3a8134cf9f6fe16db8eb3..094a60e53984b6e3dd173a32172b0e1491c89d91 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -366,6 +366,40 @@ static const struct attribute_group *visorbus_groups[] = {
  *  define & implement display of debugfs attributes under
  *  /sys/kernel/debug/visorbus/visorbus<n>.
  */
+/*
+ * vbuschannel_print_devinfo() - format a struct ultra_vbus_deviceinfo
+ *                               and write it to a seq_file
+ * @devinfo: the struct ultra_vbus_deviceinfo to format
+ * @seq: seq_file to write to
+ * @devix: the device index to be included in the output data, or -1 if no
+ *         device index is to be included
+ *
+ * Reads @devInfo, and writes it in human-readable notation to @seq.
+ */
+static void
+vbuschannel_print_devinfo(struct ultra_vbus_deviceinfo *devinfo,
+                         struct seq_file *seq, int devix)
+{
+       if (!isprint(devinfo->devtype[0]))
+               return; /* uninitialized vbus device entry */
+
+       if (devix >= 0)
+               seq_printf(seq, "[%d]", devix);
+       else
+               /* vbus device entry is for bus or chipset */
+               seq_puts(seq, "   ");
+
+       /*
+        * Note: because the s-Par back-end is free to scribble in this area,
+        * we never assume '\0'-termination.
+        */
+       seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->devtype),
+                  (int)sizeof(devinfo->devtype), devinfo->devtype);
+       seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->drvname),
+                  (int)sizeof(devinfo->drvname), devinfo->drvname);
+       seq_printf(seq, "%.*s\n", (int)sizeof(devinfo->infostrs),
+                  devinfo->infostrs);
+}
 
 static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)
 {