Commit 43c0ab0e authored by Bryan Thompson's avatar Bryan Thompson Committed by Greg Kroah-Hartman
Browse files

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: default avatarBryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <Timothy.Sell@unisys.com>
Reported-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e5bcbe6

drivers/staging/unisys/visorbus/vbushelper.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/* 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

drivers/staging/unisys/visorbus/visorbus_private.h

+25 −1
Original line number Diff line number Diff line
@@ -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);