All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Kershner <david.kershner@unisys.com>
To: gregkh@linuxfoundation.org,
	driverdev-devel@linuxdriverproject.org,
	sparmaintainer@unisys.com, jes.sorensen@redhat.com
Subject: [PATCH v3 07/21] staging: unisys: Move vbushelper.h contents to visorbus_private.h
Date: Fri, 2 Sep 2016 16:41:31 -0400	[thread overview]
Message-ID: <1472848905-4668-8-git-send-email-david.kershner@unisys.com> (raw)
In-Reply-To: <1472848905-4668-1-git-send-email-david.kershner@unisys.com>

From: Bryan Thompson <bryan.thompson@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@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>
---
 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(
+		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);
-- 
1.9.1

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply	other threads:[~2016-09-02 20:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-02 20:41 [PATCH v3 00/21] Clean up header files and remove unused structures David Kershner
2016-09-02 20:41 ` [PATCH v3 01/21] staging: unisys: visorchipset.c remove unused pound defines David Kershner
2016-09-02 20:41 ` [PATCH v3 02/21] staging: unisys: visorbus_main.c " David Kershner
2016-09-02 20:41 ` [PATCH v3 03/21] staging: unisys: visornic_main.c " David Kershner
2016-09-02 20:41 ` [PATCH v3 04/21] staging: unisys: visorbus: remove g_devicechangestate_packet David Kershner
2016-09-02 20:41 ` [PATCH v3 05/21] staging: unisys: visorbus: remove unused lists David Kershner
2016-09-02 20:41 ` [PATCH v3 06/21] staging: unisys: visorbus: remove putfile_buffer_entry David Kershner
2016-09-02 20:41 ` David Kershner [this message]
2016-09-12 11:25   ` [PATCH v3 07/21] staging: unisys: Move vbushelper.h contents to visorbus_private.h Greg KH
2016-09-02 20:41 ` [PATCH v3 08/21] staging: unisys: visorbus: Convert visorchipset.h refs David Kershner
2016-09-02 20:41 ` [PATCH v3 09/21] staging: unisys: visorbus: Merge channel_guid.h with channel.h David Kershner
2016-09-02 20:41 ` [PATCH v3 10/21] staging: unisys: visorinput: Update visorinput.c includes David Kershner
2016-09-02 20:41 ` [PATCH v3 11/21] staging: unisys: visorinput: Remove ultrainputreport.h include David Kershner
2016-09-02 20:41 ` [PATCH v3 12/21] staging: unisys: merge diagchannel.h to visorbus.h David Kershner
2016-09-02 20:41 ` [PATCH v3 13/21] staging: unisys: visorbus: Merge controlvm completion status to controlvmchannel David Kershner
2016-09-02 20:41 ` [PATCH v3 14/21] staging: unisys: visorbus: Reorder functions to avoid including header David Kershner
2016-09-02 20:41 ` [PATCH v3 15/21] staging: unisys: visorbus: merge vbusdeviceinfo.h into vbuschannel David Kershner
2016-09-02 20:41 ` [PATCH v3 16/21] staging: unisys: visorbus: Merge iovmcall_gnuc into vmcallinterface David Kershner
2016-09-02 20:41 ` [PATCH v3 17/21] staging: unisys: visorbus: remove include for vbuschannel.h David Kershner
2016-09-02 20:41 ` [PATCH v3 18/21] staging: unisys: visorbus: Move non global guestlinuxdebug to visorbus David Kershner
2016-09-02 20:41 ` [PATCH v3 19/21] staging: unisys: remove check for GNUC David Kershner
2016-09-02 20:41 ` [PATCH v3 20/21] staging: unisys: visorbus: merge guestlinuxdebug with vmcallinterface.h David Kershner
2016-09-02 20:41 ` [PATCH v3 21/21] staging: unisys: visorbus: cleanup include listings David Kershner
2016-09-12 11:23 ` [PATCH v3 00/21] Clean up header files and remove unused structures Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472848905-4668-8-git-send-email-david.kershner@unisys.com \
    --to=david.kershner@unisys.com \
    --cc=driverdev-devel@linuxdriverproject.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jes.sorensen@redhat.com \
    --cc=sparmaintainer@unisys.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.