diff options
| author | Bryan Thompson | 2016-09-02 22:41:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-12 13:26:29 +0200 |
| commit | 43c0ab0e1c7f9d5dec502af988b8922599b485f5 (patch) | |
| tree | 15dfcb16ab41bf3866f91d71e7a4304981dc91f2 /drivers/staging/unisys/visorbus/visorbus_private.h | |
| parent | staging: unisys: visorbus: remove putfile_buffer_entry (diff) | |
| download | kernel-qcow2-linux-43c0ab0e1c7f9d5dec502af988b8922599b485f5.tar.gz kernel-qcow2-linux-43c0ab0e1c7f9d5dec502af988b8922599b485f5.tar.xz kernel-qcow2-linux-43c0ab0e1c7f9d5dec502af988b8922599b485f5.zip | |
staging: unisys: Move vbushelper.h contents to visorbus_private.h
The contents of vbushelper.h are now only used by visorbus, so it no longer
needs to be a general include file and it can be incorporated in the
visorbus private header.
Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorbus/visorbus_private.h')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorbus_private.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h index 3f6ad5279f74..0624e2388c0f 100644 --- a/drivers/staging/unisys/visorbus/visorbus_private.h +++ b/drivers/staging/unisys/visorbus/visorbus_private.h @@ -21,7 +21,31 @@ #include "controlvmchannel.h" #include "vbusdeviceinfo.h" -#include "vbushelper.h" + +/* TARGET_HOSTNAME specified as -DTARGET_HOSTNAME=\"thename\" on the + * command line + */ + +#define TARGET_HOSTNAME "linuxguest" + +static inline void bus_device_info_init( + struct ultra_vbus_deviceinfo *bus_device_info_ptr, + const char *dev_type, const char *drv_name, + const char *ver, const char *ver_tag) +{ + 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), "%s\t%s\t%s", + (ver) ? ver : "unknownVer", + (ver_tag) ? ver_tag : "unknownVerTag", + TARGET_HOSTNAME); +} void chipset_bus_create(struct visor_device *bus_info); void chipset_bus_destroy(struct visor_device *bus_info); |