From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757296AbcFAC1r (ORCPT ); Tue, 31 May 2016 22:27:47 -0400 Received: from mail1.bemta12.messagelabs.com ([216.82.251.14]:24062 "EHLO mail1.bemta12.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756866AbcFAC1o (ORCPT ); Tue, 31 May 2016 22:27:44 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRWlGSWpSXmKPExsVywNY2Q5fXwy/ c4OEqE4uFbUtYLC7vmsPmwOTxeZNcAGMUa2ZeUn5FAmvGr/kTWAruhldsaVjC2sC4xK+LkYtD SGA3o8TllimMEM4BRonz3zqZIJzLjBJPN11ng3DWMUo83/mZGcLZwijRMusjexcjJwebgIHEz Dt3wWwRgfMsEk9v5XYxcnAIC0RLfHnKCBJmEVCV6FzyjAXE5hXwkjjz5A4TiC0hICdx8thkVh CbEyi+dfJ7sHohAU+J5of/oGw1icNnH7FB1AdLfD+6ixFijqDEyZlPwGYyC0hIHHzxgnkCo+A sJKlZSFILGJlWMaoXpxaVpRbpWuglFWWmZ5TkJmbm6BoaGunlphYXJ6an5iQmFesl5+duYgSG KgMQ7GD8tsT5EKMkB5OSKO8PF79wIb6k/JTKjMTijPii0pzU4kOMMhwcShK8TO5AOcGi1PTUi rTMHGDUwKQlOHiURHidQdK8xQWJucWZ6RCpU4yKUuK8LCAJAZBERmkeXBssUi8xykoJ8zICHS LEU5BalJtZgir/ilGcg1FJmNcSZApPZl4J3PRXQIuZgBbHZ/iALC5JREhJNTAWOchqPkwSPc/ 8dUvb9Qlb3a7Gsaw8tkEs+JxO7Mk779ersv5dwLP6XN0c1bwPhpev5aU95i2MdNc6O2/3Gem+ rNd9J2btvPxv4csJG2cfaixlWu7HJFQUceZ955puy68zZrtEh7Xbnzp/QK559ll5ofhk0zze1 IJoxqZtq7rPd0vO+LJdoEZAiaU4I9FQi7moOBEAlfu1Us8CAAA= X-Env-Sender: David.Kershner@unisys.com X-Msg-Ref: server-5.tower-200.messagelabs.com!1464748041!5022672!10 X-Originating-IP: [192.61.61.104] X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked From: David Kershner To: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 25/27] include: linux: visorbus: Add visorbus to include/linux directory Date: Tue, 31 May 2016 22:26:51 -0400 Message-ID: <1464748013-31309-26-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464748013-31309-1-git-send-email-david.kershner@unisys.com> References: <1464748013-31309-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 01 Jun 2016 02:27:05.0990 (UTC) FILETIME=[16FD7260:01D1BBAD] 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 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 0a537c7..ac480fb 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 1b743d7..40c484a 100644 --- a/drivers/staging/unisys/visorbus/visorchannel.c +++ b/drivers/staging/unisys/visorbus/visorchannel.c @@ -22,8 +22,8 @@ #include #include -#include "version.h" -#include "visorbus.h" +#include +#include #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 #include #include +#include +#include +#include +#include -#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 + #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 #include #include - -#include "visorbus.h" -#include "iochannel.h" +#include +#include /* 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 #include #include +#include +#include +#include #include -#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 #include #include - -#include "visorbus.h" -#include "iochannel.h" +#include +#include #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