[PATCH v3 07/21] staging: unisys: Move vbushelper.h contents to visorbus_private.h

[Greg KH]

On Fri, Sep 02, 2016 at 04:41:31PM -0400, David Kershner wrote:
> From: Bryan Thompson <bryan.thompson at unisys.com>
> 
> 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 at unisys.com>
> Signed-off-by: David Kershner <david.kershner at unisys.com>
> Reviewed-by: Tim Sell <Timothy.Sell at unisys.com>
> Reported-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>  drivers/staging/unisys/visorbus/vbushelper.h       | 46 ----------------------
>  drivers/staging/unisys/visorbus/visorbus_private.h | 26 +++++++++++-
>  2 files changed, 25 insertions(+), 47 deletions(-)
>  delete mode 100644 drivers/staging/unisys/visorbus/vbushelper.h
> 
> diff --git a/drivers/staging/unisys/visorbus/vbushelper.h b/drivers/staging/unisys/visorbus/vbushelper.h
> deleted file mode 100644
> index f1b6aac..0000000
> --- a/drivers/staging/unisys/visorbus/vbushelper.h
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -/* vbushelper.h
> - *
> - * Copyright (C) 2011 - 2013 UNISYS CORPORATION
> - * All rights reserved.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or (at
> - * your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
> - * NON INFRINGEMENT.  See the GNU General Public License for more
> - * details.
> - */
> -
> -#ifndef __VBUSHELPER_H__
> -#define __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);
> -}
> -
> -#endif
> diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
> index 3f6ad52..0624e23 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(

A minor nit, "inline" doesn't always do what you think it does, so I
would recommend just dropping it and letting gcc do it all for you, as
it really is going to do it that anyway.

thanks,

greg k-h