From: David Kershner <david.kershner@unisys.com>
To: <corbet@lwn.net>, <tglx@linutronix.de>, <mingo@redhat.com>,
<hpa@zytor.com>, <david.kershner@unisys.com>,
<gregkh@linuxfoundation.org>, <erik.arfvidson@unisys.com>,
<timothy.sell@unisys.com>, <hofrat@osadl.org>,
<dzickus@redhat.com>, <jes.sorensen@redhat.com>,
<alexander.curtin@unisys.com>, <janani.rvchndrn@gmail.com>,
<sudipm.mukherjee@gmail.com>, <prarit@redhat.com>,
<david.binder@unisys.com>, <nhorman@redhat.com>,
<dan.j.williams@intel.com>, <linux-kernel@vger.kernel.org>,
<linux-doc@vger.kernel.org>,
<driverdev-devel@linuxdriverproject.org>,
<sparmaintainer@unisys.com>
Subject: [PATCH v2 25/27] include: linux: visorbus: Add visorbus to include/linux directory
Date: Tue, 31 May 2016 22:26:51 -0400 [thread overview]
Message-ID: <1464748013-31309-26-git-send-email-david.kershner@unisys.com> (raw)
In-Reply-To: <1464748013-31309-1-git-send-email-david.kershner@unisys.com>
Update include/linux to include the s-Par associated common include
header files needed for the s-Par visorbus.
Since we have now moved the include directories over to
include/linux/visorbus this patch makes all of the visor
drivers visorbus, visorinput, visornic, and visorhba use
the new include folders.
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
---
drivers/staging/unisys/MAINTAINERS | 2 +-
drivers/staging/unisys/visorbus/Makefile | 2 --
drivers/staging/unisys/visorbus/controlvmchannel.h | 2 +-
drivers/staging/unisys/visorbus/vbuschannel.h | 3 ++-
drivers/staging/unisys/visorbus/visorbus_main.c | 6 +++---
drivers/staging/unisys/visorbus/visorchannel.c | 4 ++--
drivers/staging/unisys/visorbus/visorchipset.c | 8 ++++----
drivers/staging/unisys/visorbus/vmcallinterface.h | 5 ++---
drivers/staging/unisys/visorhba/Makefile | 2 --
drivers/staging/unisys/visorhba/visorhba_main.c | 5 ++---
drivers/staging/unisys/visorinput/Makefile | 2 --
drivers/staging/unisys/visorinput/visorinput.c | 6 +++---
drivers/staging/unisys/visornic/Makefile | 2 --
drivers/staging/unisys/visornic/visornic_main.c | 5 ++---
.../staging/unisys/include => include/linux/visorbus}/channel.h | 0
.../unisys/include => include/linux/visorbus}/channel_guid.h | 0
.../unisys/include => include/linux/visorbus}/diagchannel.h | 0
.../unisys/include => include/linux/visorbus}/guestlinuxdebug.h | 0
.../staging/unisys/include => include/linux/visorbus}/iochannel.h | 0
.../staging/unisys/include => include/linux/visorbus}/version.h | 0
.../staging/unisys/include => include/linux/visorbus}/visorbus.h | 0
21 files changed, 22 insertions(+), 32 deletions(-)
rename {drivers/staging/unisys/include => include/linux/visorbus}/channel.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/channel_guid.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/diagchannel.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/guestlinuxdebug.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/iochannel.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/version.h (100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/visorbus.h (100%)
diff --git a/drivers/staging/unisys/MAINTAINERS b/drivers/staging/unisys/MAINTAINERS
index 1f0425b..146a8c3 100644
--- a/drivers/staging/unisys/MAINTAINERS
+++ b/drivers/staging/unisys/MAINTAINERS
@@ -1,5 +1,5 @@
Unisys s-Par drivers
M: David Kershner <sparmaintainer@unisys.com>
S: Maintained
-F: Documentation/s-Par/overview.txt
+F: Documentation/visorbus.txt
F: drivers/staging/unisys/
diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/staging/unisys/visorbus/Makefile
index f3730d8..7f328cc 100644
--- a/drivers/staging/unisys/visorbus/Makefile
+++ b/drivers/staging/unisys/visorbus/Makefile
@@ -7,5 +7,3 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus.o
visorbus-y := visorbus_main.o
visorbus-y += visorchannel.o
visorbus-y += visorchipset.o
-
-ccflags-y += -Idrivers/staging/unisys/include
diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h
index 03e36fb..0a0e221 100644
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -16,7 +16,7 @@
#define __CONTROLVMCHANNEL_H__
#include <linux/uuid.h>
-#include "channel.h"
+#include <linux/visorbus/channel.h>
/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
#define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID \
diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index 90fa12e..3e0388d 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -23,8 +23,9 @@
* the client devices and client drivers for the server end to see.
*/
#include <linux/uuid.h>
+#include <linux/visorbus/channel.h>
+
#include "vbusdeviceinfo.h"
-#include "channel.h"
/* {193b331b-c58f-11da-95a9-00e08161165f} */
#define SPAR_VBUS_CHANNEL_PROTOCOL_UUID \
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 0a537c7..ac480fb 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -16,11 +16,11 @@
#include <linux/uuid.h>
-#include "visorbus.h"
+#include <linux/visorbus/visorbus.h>
+#include <linux/visorbus/version.h>
+#include <linux/visorbus/guestlinuxdebug.h>
#include "visorbus_private.h"
-#include "version.h"
#include "vbuschannel.h"
-#include "guestlinuxdebug.h"
#include "vmcallinterface.h"
#define MYDRVNAME "visorbus"
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 1b743d7..40c484a 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -22,8 +22,8 @@
#include <linux/uuid.h>
#include <linux/io.h>
-#include "version.h"
-#include "visorbus.h"
+#include <linux/visorbus/version.h>
+#include <linux/visorbus/visorbus.h>
#include "controlvmchannel.h"
#include "visorbus_private.h"
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 189ba40..c0b7e6c 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -24,13 +24,13 @@
#include <linux/platform_device.h>
#include <linux/uuid.h>
#include <linux/crash_dump.h>
+#include <linux/visorbus/channel_guid.h>
+#include <linux/visorbus/guestlinuxdebug.h>
+#include <linux/visorbus/version.h>
+#include <linux/visorbus/visorbus.h>
-#include "channel_guid.h"
#include "controlvmchannel.h"
#include "controlvmcompletionstatus.h"
-#include "guestlinuxdebug.h"
-#include "version.h"
-#include "visorbus.h"
#include "visorbus_private.h"
#include "vmcallinterface.h"
diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index c043fa4..aac7000 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -21,10 +21,9 @@
* running on IO Partitions.
*/
-#ifdef __GNUC__
+#include <linux/visorbus/diagchannel.h>
+
#include "iovmcall_gnuc.h"
-#endif /* */
-#include "diagchannel.h"
#ifdef VMCALL_IO_CONTROLVM_ADDR
#undef VMCALL_IO_CONTROLVM_ADDR
diff --git a/drivers/staging/unisys/visorhba/Makefile b/drivers/staging/unisys/visorhba/Makefile
index a8a8e0e..e65b2be 100644
--- a/drivers/staging/unisys/visorhba/Makefile
+++ b/drivers/staging/unisys/visorhba/Makefile
@@ -6,5 +6,3 @@ obj-$(CONFIG_UNISYS_VISORHBA) += visorhba.o
visorhba-y := visorhba_main.o
-ccflags-y += -Idrivers/staging/unisys/include
-
diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
index 6a4570d..6e280e0 100644
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -20,9 +20,8 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
-
-#include "visorbus.h"
-#include "iochannel.h"
+#include <linux/visorbus/visorbus.h>
+#include <linux/visorbus/iochannel.h>
/* The Send and Receive Buffers of the IO Queue may both be full */
diff --git a/drivers/staging/unisys/visorinput/Makefile b/drivers/staging/unisys/visorinput/Makefile
index beedca7..87426a0 100644
--- a/drivers/staging/unisys/visorinput/Makefile
+++ b/drivers/staging/unisys/visorinput/Makefile
@@ -3,5 +3,3 @@
#
obj-$(CONFIG_UNISYS_VISORINPUT) += visorinput.o
-
-ccflags-y += -Idrivers/staging/unisys/include
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index 9c00710..2b12d23 100644
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -27,11 +27,11 @@
#include <linux/input.h>
#include <linux/uaccess.h>
#include <linux/kernel.h>
+#include <linux/visorbus/version.h>
+#include <linux/visorbus/visorbus.h>
+#include <linux/visorbus/channel.h>
#include <linux/uuid.h>
-#include "version.h"
-#include "visorbus.h"
-#include "channel.h"
#include "ultrainputreport.h"
/* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */
diff --git a/drivers/staging/unisys/visornic/Makefile b/drivers/staging/unisys/visornic/Makefile
index 439e95e..43985bb 100644
--- a/drivers/staging/unisys/visornic/Makefile
+++ b/drivers/staging/unisys/visornic/Makefile
@@ -6,5 +6,3 @@ obj-$(CONFIG_UNISYS_VISORNIC) += visornic.o
visornic-y := visornic_main.o
-ccflags-y += -Idrivers/staging/unisys/include
-
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 9e5b258..b971be3 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -24,9 +24,8 @@
#include <linux/kthread.h>
#include <linux/skbuff.h>
#include <linux/rtnetlink.h>
-
-#include "visorbus.h"
-#include "iochannel.h"
+#include <linux/visorbus/visorbus.h>
+#include <linux/visorbus/iochannel.h>
#define VISORNIC_INFINITE_RSP_WAIT 0
#define VISORNICSOPENMAX 32
diff --git a/drivers/staging/unisys/include/channel.h b/include/linux/visorbus/channel.h
similarity index 100%
rename from drivers/staging/unisys/include/channel.h
rename to include/linux/visorbus/channel.h
diff --git a/drivers/staging/unisys/include/channel_guid.h b/include/linux/visorbus/channel_guid.h
similarity index 100%
rename from drivers/staging/unisys/include/channel_guid.h
rename to include/linux/visorbus/channel_guid.h
diff --git a/drivers/staging/unisys/include/diagchannel.h b/include/linux/visorbus/diagchannel.h
similarity index 100%
rename from drivers/staging/unisys/include/diagchannel.h
rename to include/linux/visorbus/diagchannel.h
diff --git a/drivers/staging/unisys/include/guestlinuxdebug.h b/include/linux/visorbus/guestlinuxdebug.h
similarity index 100%
rename from drivers/staging/unisys/include/guestlinuxdebug.h
rename to include/linux/visorbus/guestlinuxdebug.h
diff --git a/drivers/staging/unisys/include/iochannel.h b/include/linux/visorbus/iochannel.h
similarity index 100%
rename from drivers/staging/unisys/include/iochannel.h
rename to include/linux/visorbus/iochannel.h
diff --git a/drivers/staging/unisys/include/version.h b/include/linux/visorbus/version.h
similarity index 100%
rename from drivers/staging/unisys/include/version.h
rename to include/linux/visorbus/version.h
diff --git a/drivers/staging/unisys/include/visorbus.h b/include/linux/visorbus/visorbus.h
similarity index 100%
rename from drivers/staging/unisys/include/visorbus.h
rename to include/linux/visorbus/visorbus.h
--
1.9.1
next prev parent reply other threads:[~2016-06-01 2:27 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 2:26 [PATCH v2 00/27] Fixed issues raised by tglx, then move visorbus to drivers/virt David Kershner
2016-06-01 2:26 ` [PATCH v2 01/27] staging: unisys: visorbus change -1 return values David Kershner
2016-06-01 13:27 ` Neil Horman
2016-06-01 2:26 ` [PATCH v2 02/27] staging: unisys: visorchipset change -1 return value David Kershner
2016-06-01 13:11 ` Neil Horman
2016-06-01 2:26 ` [PATCH v2 03/27] staging: unisys: iovmcall_gnuc.h change -1 return values David Kershner
2016-06-01 13:36 ` Neil Horman
2016-06-01 2:26 ` [PATCH v2 04/27] staging: unisys: visorbus: remove unused module parameters David Kershner
2016-06-01 2:26 ` [PATCH v2 05/27] staging: unisys: visorbus: remove unused struct David Kershner
2016-06-01 2:26 ` [PATCH v2 06/27] staging: unisys: visorbus: modify format string to match argument David Kershner
2016-06-01 2:26 ` [PATCH v2 07/27] staging: unisys: visornic: Correct comment spelling mistake David Kershner
2016-06-01 2:26 ` [PATCH v2 08/27] staging: unisys: include: Remove thread-related enum members David Kershner
2016-06-01 2:26 ` [PATCH v2 09/27] staging: unisys: visorbus: removed unused periodic_test_workqueue David Kershner
2016-06-01 2:26 ` [PATCH v2 10/27] staging: unisys: visorinput: remove unnecessary locking David Kershner
2016-06-01 6:40 ` Thomas Gleixner
2016-06-03 4:34 ` Sell, Timothy C
2016-06-01 14:17 ` Neil Horman
2016-06-01 15:09 ` Sell, Timothy C
2016-06-01 18:42 ` Neil Horman
2016-06-02 5:02 ` Sell, Timothy C
2016-06-02 12:46 ` Neil Horman
2016-06-01 2:26 ` [PATCH v2 11/27] staging: unisys: visorbus: use kernel timer instead of workqueue David Kershner
2016-06-01 2:26 ` [PATCH v2 12/27] staging: unisys: visorbus: remove periodic_work.h/.c David Kershner
2016-06-01 2:26 ` [PATCH v2 13/27] staging: unisys: visorbus: Make visordriver_callback_lock a mutex David Kershner
2016-06-01 6:45 ` Thomas Gleixner
2016-06-01 2:26 ` [PATCH v2 14/27] staging: unisys: visorbus: Remove unnecessary EXPORT_SYMBOL statements David Kershner
2016-06-01 2:26 ` [PATCH v2 15/27] staging: unisys: visorbus: Remove unused functions David Kershner
2016-06-01 2:26 ` [PATCH v2 16/27] staging: unisys: Remove reference to unused STANDALONE_CLIENT David Kershner
2016-06-01 2:26 ` [PATCH v2 17/27] staging: unisys: visorbus: vbusdeviceinfo function descriptions more kerneldoc-like David Kershner
2016-06-01 2:26 ` [PATCH v2 18/27] staging: unisys: visorbus: make " David Kershner
2016-06-01 2:26 ` [PATCH v2 19/27] staging: unisys: visorbus: make visorbus_private.h " David Kershner
2016-06-01 2:26 ` [PATCH v2 20/27] staging: unisys: visorbus: make visorchannel " David Kershner
2016-06-01 6:43 ` Thomas Gleixner
2016-06-01 2:26 ` [PATCH v2 21/27] staging: unisys: visorbus: make visorchipset " David Kershner
2016-06-01 2:26 ` [PATCH v2 22/27] staging: unisys: visorbus: Move visorbus-unique functions to private header David Kershner
2016-06-01 2:26 ` [PATCH v2 23/27] staging: unisys: visorbus: Add kerneldoc-style comments for visorbus API David Kershner
2016-06-01 2:26 ` [PATCH v2 24/27] staging: unisys: Move vbushelper.h to visorbus directory David Kershner
2016-06-01 2:26 ` David Kershner [this message]
2016-06-01 2:26 ` [PATCH v2 26/27] Documentation: Move visorbus documentation from staging to Documentation/ David Kershner
2016-06-01 2:26 ` [PATCH v2 27/27] drivers: Add visorbus to the drivers directory David Kershner
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=1464748013-31309-26-git-send-email-david.kershner@unisys.com \
--to=david.kershner@unisys.com \
--cc=alexander.curtin@unisys.com \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=david.binder@unisys.com \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=dzickus@redhat.com \
--cc=erik.arfvidson@unisys.com \
--cc=gregkh@linuxfoundation.org \
--cc=hofrat@osadl.org \
--cc=hpa@zytor.com \
--cc=janani.rvchndrn@gmail.com \
--cc=jes.sorensen@redhat.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nhorman@redhat.com \
--cc=prarit@redhat.com \
--cc=sparmaintainer@unisys.com \
--cc=sudipm.mukherjee@gmail.com \
--cc=tglx@linutronix.de \
--cc=timothy.sell@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®