lkml.org 
[lkml]   [2016]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 25/27] include: linux: visorbus: Add visorbus to include/linux directory
    Date
    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
    \
     
     \ /
      Last update: 2016-06-01 04:41    [W:3.269 / U:1.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site