diff options
| author | Jon Frisch | 2016-09-26 17:03:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-09-27 13:06:16 +0200 |
| commit | e82ed633eb814f25861d8942ed33881e4b36d5c4 (patch) | |
| tree | 5d26f3b03e23c8abbb24e83d803e60c525b253c8 /drivers/staging/unisys/visorbus/visorbus_private.h | |
| parent | staging: ks7010: Use __packed over __attribute__((packed)) (diff) | |
| download | kernel-qcow2-linux-e82ed633eb814f25861d8942ed33881e4b36d5c4.tar.gz kernel-qcow2-linux-e82ed633eb814f25861d8942ed33881e4b36d5c4.tar.xz kernel-qcow2-linux-e82ed633eb814f25861d8942ed33881e4b36d5c4.zip | |
staging: unisys: remove driver version from struct visor_driver
This patch removes the all instances of the driver version from
struct visor_driver. This includes removing version, vertag
(a human readable version string of the driver version) and
version_attr from struct visor_driver. This resulted in removing the
bus attributes and driver attributes which only contained the driver
version. The utsname function is used to replace the driver version
with the kernel version in bus_device_info_init().
Signed-off-by: Jon Frisch <jon.frisch@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Kershner <david.kershner@unisys.com>
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h index 2f4e1e6071f5..15403fb52847 100644 --- a/drivers/staging/unisys/visorbus/visorbus_private.h +++ b/drivers/staging/unisys/visorbus/visorbus_private.h @@ -18,6 +18,7 @@ #define __VISORBUS_PRIVATE_H__ #include <linux/uuid.h> +#include <linux/utsname.h> #include "controlvmchannel.h" #include "vbuschannel.h" @@ -26,12 +27,9 @@ * 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) + 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, @@ -41,10 +39,8 @@ static inline void bus_device_info_init( 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); + sizeof(bus_device_info_ptr->infostrs), "kernel ver. %s", + utsname()->release); } void chipset_bus_create(struct visor_device *bus_info); |