Re: [PATCH 1/3] include: linux: visorbus: Add visorbus to include/linux directory
Please don't send any move patches but the actual code added to the kernel proper. And based on what's in linux-next I don't think this giant pile of junk is anywhere near mergeable. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] include: linux: visorbus: Add visorbus to include/linux directory
Update include/linux to include the s-Par drivers set's common header
files, which are needed for the s-Par visorbus.
Since the include directories are now moved to include/linux/visorbus, this
patch makes all the s-Par drivers (visorbus, visorinput, visornic, and
visorhba) use the new include folder.
Signed-off-by: David Kershner
Reviewed-by: Tim Sell
---
MAINTAINERS | 1 +
drivers/staging/unisys/visorbus/Makefile | 2 --
drivers/staging/unisys/visorbus/controlvmchannel.h | 2 +-
drivers/staging/unisys/visorbus/vbuschannel.h| 2 +-
drivers/staging/unisys/visorbus/visorbus_main.c | 2 +-
drivers/staging/unisys/visorbus/visorchannel.c | 2 +-
drivers/staging/unisys/visorbus/visorchipset.c | 2 +-
drivers/staging/unisys/visorhba/Makefile | 3 ---
drivers/staging/unisys/visorhba/visorhba_main.c | 4 ++--
drivers/staging/unisys/visorinput/Makefile | 2 --
drivers/staging/unisys/visorinput/visorinput.c | 2 +-
drivers/staging/unisys/visornic/Makefile | 2 --
drivers/staging/unisys/visornic/visornic_main.c | 5 ++---
{drivers/staging/unisys/include => include/linux/visorbus}/channel.h | 0
.../staging/unisys/include => include/linux/visorbus}/iochannel.h| 2 +-
.../staging/unisys/include => include/linux/visorbus}/visorbus.h | 3 +--
16 files changed, 13 insertions(+), 23 deletions(-)
rename {drivers/staging/unisys/include => include/linux/visorbus}/channel.h
(100%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/iochannel.h
(99%)
rename {drivers/staging/unisys/include => include/linux/visorbus}/visorbus.h
(99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9e98464..0893d53 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13116,6 +13116,7 @@ M: David Kershner
L: sparmaintai...@unisys.com (Unisys internal)
S: Supported
F: drivers/staging/unisys/
+F: include/linux/visorbus/
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
M: Vinayak Holikatti
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 ed045ef..875603b 100644
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -16,7 +16,7 @@
#define __CONTROLVMCHANNEL_H__
#include
-#include "channel.h"
+#include
/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
#define VISOR_CONTROLVM_CHANNEL_UUID \
diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h
b/drivers/staging/unisys/visorbus/vbuschannel.h
index 01d7d51..dd9df0a 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -24,7 +24,7 @@
*/
#include
#include
-#include "channel.h"
+#include
/* {193b331b-c58f-11da-95a9-00e08161165f} */
#define VISOR_VBUS_CHANNEL_UUID \
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c
b/drivers/staging/unisys/visorbus/visorbus_main.c
index 1c785dd..bf759e7 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -16,8 +16,8 @@
#include
#include
+#include
-#include "visorbus.h"
#include "visorbus_private.h"
#define MYDRVNAME "visorbus"
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c
b/drivers/staging/unisys/visorbus/visorchannel.c
index 6885c2c..8c05af6 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -21,8 +21,8 @@
#include
#include
+#include
-#include "visorbus.h"
#include "visorbus_private.h"
#include "controlvmchannel.h"
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c
b/drivers/staging/unisys/visorbus/visorchipset.c
index 2215056..1324849 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -22,8 +22,8 @@
#include
#include
#include
+#include
-#include "visorbus.h"
#include "visorbus_private.h"
#include "vmcallinterface.h"
diff --git a/drivers/staging/unisys/visorhba/Makefile
b/drivers/staging/unisys/visorhba/Makefile
index a8a8e0e..c321f6a 100644
--- a/drivers/staging/unisys/visorhba/Makefile
+++ b/drivers/staging/unisys/visorhba/Makefile
@@ -5,6 +5,3 @@
obj-$(CONFIG_UNISYS_VISORHBA) += visor
Re: [PATCH 1/3] include: linux: visorbus: Add visorbus to include/linux directory
On Fri, Jun 10, 2016 at 11:23:54PM -0400, David Kershner wrote:
> 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
> Reviewed-by: Tim Sell
> ---
> 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
> S: Maintained
> -F: Documentation/s-Par/overview.txt
> +F: Documentation/visorbus.txt
> F: drivers/staging/unisys/
This MAINTAINERS change doesn't have anything to do with moving the .h
files around :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] include: linux: visorbus: Add visorbus to include/linux directory
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
Reviewed-by: Tim Sell
---
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
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
-#include "channel.h"
+#include
/* {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
+#include
+
#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 293532f..2af051c 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -16,11 +16,11 @@
#include
-#include "visorbus.h"
+#include
+#include
+#include
#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 fbae66e.
