From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752875AbcEQHfR (ORCPT ); Tue, 17 May 2016 03:35:17 -0400 Received: from mail1.bemta8.messagelabs.com ([216.82.243.193]:62748 "EHLO mail1.bemta8.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791AbcEQHfO (ORCPT ); Tue, 17 May 2016 03:35:14 -0400 X-Greylist: delayed 399 seconds by postgrey-1.27 at vger.kernel.org; Tue, 17 May 2016 03:35:13 EDT X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsVywNY2U1fuhFW 4wfNuNYuFbUtYLC7vmsPmwOTxeZNcAGMUa2ZeUn5FAmvGz7ZJzAVtChXTW08xNzCeku5i5OIQ EtjNKPG1bwIbhHOAUWJuy24o5zKjxNWLfewQzjpGiTkLDzNCOFsYJe5uecHSxcjJwSZgIDHzz l12EFtE4DyLxNNbuSC2sICvxN1T0xhBbBYBVYmb3X1sIDavgKfE/sXnwOISAnISJ49NZgWxOQ W8JG78egZWIwRUc/3Tc0YIW03i8NlHbBD1wRIfXi1mgpgjKHFy5hOwG5gFJCQOvnjBPIFRcBa S1CwkqQWMTKsYNYpTi8pSi3QNjfSSijLTM0pyEzNzdA0NLPRyU4uLE9NTcxKTivWS83M3MQLD lQEIdjBOmOV8iFGSg0lJlNfyoFW4EF9SfkplRmJxRnxRaU5q8SFGGQ4OJQnewONAOcGi1PTUi rTMHGDkwKQlOHiURHgLQdK8xQWJucWZ6RCpU4yKUuK8cSAJAZBERmkeXBssWi8xykoJ8zICHS LEU5BalJtZgir/ilGcg1FJmFcRZApPZl4J3PRXQIuZgBZPMLMAWVySiJCSamA0Z9I5v2wB+/0 ffbvEXiT1nXg/Uf+1zIoOJrXaLwciE6Y2HU9Zq+xdk2tZv+whr5bpzJMJTyq8iveZTbTpzn5v Gzrflevx3DtrjEWrHjdaZ62IX23VL8J+OPr9+ZgXC99fPaXJpabmeNsl3u3iDV6fac4bwhzEz wuY836wnqmxne0dp3SckqUSS3FGoqEWc1FxIgAdAdfR0QIAAA== X-Env-Sender: David.Kershner@unisys.com X-Msg-Ref: server-5.tower-46.messagelabs.com!1463470109!26102209!5 X-Originating-IP: [192.61.61.105] X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked From: David Kershner To: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH 1/5] staging: unisys: Move vbushelper.h to visorbus directory Date: Tue, 17 May 2016 03:27:57 -0400 Message-ID: <1463470081-24223-2-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463470081-24223-1-git-send-email-david.kershner@unisys.com> References: <1463470081-24223-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 17 May 2016 07:28:28.0901 (UTC) FILETIME=[B50C7150:01D1B00D] MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only visorbus needs this header file so move it to visorbus directory. Signed-off-by: David Kershner --- drivers/staging/unisys/include/vbushelper.h | 46 ---------------------------- drivers/staging/unisys/visorbus/vbushelper.h | 46 ++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 drivers/staging/unisys/include/vbushelper.h create mode 100644 drivers/staging/unisys/visorbus/vbushelper.h diff --git a/drivers/staging/unisys/include/vbushelper.h b/drivers/staging/unisys/include/vbushelper.h deleted file mode 100644 index f1b6aac..0000000 --- a/drivers/staging/unisys/include/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/vbushelper.h b/drivers/staging/unisys/visorbus/vbushelper.h new file mode 100644 index 0000000..f1b6aac --- /dev/null +++ b/drivers/staging/unisys/visorbus/vbushelper.h @@ -0,0 +1,46 @@ +/* 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 -- 1.9.1