lkml.org 
[lkml]   [2016]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] staging: unisys: visorbus: Have visorbus use include/linux/visorbus
    Date
    Since we have now moved the include directories over to
    include/linux/visorbus this patch makes all of visorbus
    use the new include folders.

    Signed-off-by: David Kershner <david.kershner@unisys.com>
    ---
    drivers/staging/unisys/visorbus/controlvmchannel.h | 2 +-
    drivers/staging/unisys/visorbus/periodic_work.c | 3 +--
    drivers/staging/unisys/visorbus/vbuschannel.h | 3 ++-
    drivers/staging/unisys/visorbus/visorbus_main.c | 8 ++++----
    drivers/staging/unisys/visorbus/visorchannel.c | 4 ++--
    drivers/staging/unisys/visorbus/visorchipset.c | 10 +++++-----
    drivers/staging/unisys/visorbus/vmcallinterface.h | 5 ++---
    7 files changed, 17 insertions(+), 18 deletions(-)

    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/periodic_work.c b/drivers/staging/unisys/visorbus/periodic_work.c
    index 00b1527..9b3b150 100644
    --- a/drivers/staging/unisys/visorbus/periodic_work.c
    +++ b/drivers/staging/unisys/visorbus/periodic_work.c
    @@ -18,8 +18,7 @@
    * Helper functions to schedule periodic work in Linux kernel mode.
    */
    #include <linux/sched.h>
    -
    -#include "periodic_work.h"
    +#include <linux/visorbus/periodic_work.h>

    #define MYDRVNAME "periodic_work"

    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 d32b898..efd87c6 100644
    --- a/drivers/staging/unisys/visorbus/visorbus_main.c
    +++ b/drivers/staging/unisys/visorbus/visorbus_main.c
    @@ -16,12 +16,12 @@

    #include <linux/uuid.h>

    -#include "visorbus.h"
    +#include <linux/visorbus/visorbus.h>
    +#include <linux/visorbus/version.h>
    +#include <linux/visorbus/periodic_work.h>
    +#include <linux/visorbus/guestlinuxdebug.h>
    #include "visorbus_private.h"
    -#include "version.h"
    -#include "periodic_work.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 4337358..4e8b0ef 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"

    #define MYDRVNAME "visorchannel"
    diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
    index 1a06baf..630137a 100644
    --- a/drivers/staging/unisys/visorbus/visorchipset.c
    +++ b/drivers/staging/unisys/visorbus/visorchipset.c
    @@ -24,14 +24,14 @@
    #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/periodic_work.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 "periodic_work.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
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-05-17 10:01    [W:3.369 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site