Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 738561a8 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

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: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fb2539c

drivers/staging/unisys/visorbus/vbuschannel.h

+0 −35
Original line number Original line Diff line number Diff line
@@ -64,41 +64,6 @@ struct ultra_vbus_deviceinfo { 
	u8 reserved[128];	/* pad size to 256 bytes */

	u8 reserved[128];	/* pad size to 256 bytes */

} __packed;

} __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 {

struct spar_vbus_headerinfo {

	u32 struct_bytes;	/* size of this struct in bytes */

	u32 struct_bytes;	/* size of this struct in bytes */

	u32 device_info_struct_bytes;	/* sizeof(ULTRA_VBUS_DEVICEINFO) */

	u32 device_info_struct_bytes;	/* sizeof(ULTRA_VBUS_DEVICEINFO) */

drivers/staging/unisys/visorbus/visorbus_main.c

+34 −0
Original line number Original line Diff line number Diff line
@@ -366,6 +366,40 @@ static const struct attribute_group *visorbus_groups[] = { 
 *  define & implement display of debugfs attributes under

 *  define & implement display of debugfs attributes under

 *  /sys/kernel/debug/visorbus/visorbus<n>.

 *  /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)

static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)

{

{