lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/24] staging: unisys: visorbus: Move visorbus-unique functions to private header
    Date
    From: David Binder <david.binder@unisys.com>

    Moves function prototypes that are unique to visorbus from
    include/visorbus.h to visorbus/visorbus_private.h.

    Signed-off-by: David Binder <david.binder@unisys.com>
    Signed-off-by: David Kershner <david.kershner@unisys.com>
    ---
    drivers/staging/unisys/include/visorbus.h | 25 --------------------
    drivers/staging/unisys/visorbus/visorbus_private.h | 27 ++++++++++++++++++++++
    drivers/staging/unisys/visorbus/visorchannel.c | 1 +
    3 files changed, 28 insertions(+), 25 deletions(-)

    diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
    index 94dd48e..2c103e8 100644
    --- a/drivers/staging/unisys/include/visorbus.h
    +++ b/drivers/staging/unisys/include/visorbus.h
    @@ -188,37 +188,12 @@ int visorbus_write_channel(struct visor_device *dev,
    void visorbus_enable_channel_interrupts(struct visor_device *dev);
    void visorbus_disable_channel_interrupts(struct visor_device *dev);

    -/* Note that for visorchannel_create()
    - * <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
    - * In this case, the values can simply be read from the channel header.
    - */
    -struct visorchannel *visorchannel_create(u64 physaddr,
    - unsigned long channel_bytes,
    - gfp_t gfp, uuid_le guid);
    -struct visorchannel *visorchannel_create_with_lock(u64 physaddr,
    - unsigned long channel_bytes,
    - gfp_t gfp, uuid_le guid);
    -void visorchannel_destroy(struct visorchannel *channel);
    -int visorchannel_read(struct visorchannel *channel, ulong offset,
    - void *local, ulong nbytes);
    -int visorchannel_write(struct visorchannel *channel, ulong offset,
    - void *local, ulong nbytes);
    bool visorchannel_signalremove(struct visorchannel *channel, u32 queue,
    void *msg);
    bool visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
    void *msg);
    bool visorchannel_signalempty(struct visorchannel *channel, u32 queue);
    -
    -u64 visorchannel_get_physaddr(struct visorchannel *channel);
    -ulong visorchannel_get_nbytes(struct visorchannel *channel);
    -char *visorchannel_id(struct visorchannel *channel, char *s);
    -char *visorchannel_zoneid(struct visorchannel *channel, char *s);
    -u64 visorchannel_get_clientpartition(struct visorchannel *channel);
    -int visorchannel_set_clientpartition(struct visorchannel *channel,
    - u64 partition_handle);
    uuid_le visorchannel_get_uuid(struct visorchannel *channel);
    -char *visorchannel_uuid_id(uuid_le *guid, char *s);
    -void __iomem *visorchannel_get_header(struct visorchannel *channel);

    #define BUS_ROOT_DEVICE UINT_MAX
    struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
    diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
    index f48f230..0ee7904 100644
    --- a/drivers/staging/unisys/visorbus/visorbus_private.h
    +++ b/drivers/staging/unisys/visorbus/visorbus_private.h
    @@ -66,4 +66,31 @@ visorchipset_register_busdev(
    /* visorbus init and exit functions */
    int visorbus_init(void);
    void visorbus_exit(void);
    +
    +/* Visorchannel access functions */
    +
    +/* Note that for visorchannel_create()
    + * <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
    + * In this case, the values can simply be read from the channel header.
    + */
    +struct visorchannel *visorchannel_create(u64 physaddr,
    + unsigned long channel_bytes,
    + gfp_t gfp, uuid_le guid);
    +struct visorchannel *visorchannel_create_with_lock(u64 physaddr,
    + unsigned long channel_bytes,
    + gfp_t gfp, uuid_le guid);
    +void visorchannel_destroy(struct visorchannel *channel);
    +int visorchannel_read(struct visorchannel *channel, ulong offset,
    + void *local, ulong nbytes);
    +int visorchannel_write(struct visorchannel *channel, ulong offset,
    + void *local, ulong nbytes);
    +u64 visorchannel_get_physaddr(struct visorchannel *channel);
    +ulong visorchannel_get_nbytes(struct visorchannel *channel);
    +char *visorchannel_id(struct visorchannel *channel, char *s);
    +char *visorchannel_zoneid(struct visorchannel *channel, char *s);
    +u64 visorchannel_get_clientpartition(struct visorchannel *channel);
    +int visorchannel_set_clientpartition(struct visorchannel *channel,
    + u64 partition_handle);
    +char *visorchannel_uuid_id(uuid_le *guid, char *s);
    +void __iomem *visorchannel_get_header(struct visorchannel *channel);
    #endif
    diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
    index b9f0b6b..1b743d7 100644
    --- a/drivers/staging/unisys/visorbus/visorchannel.c
    +++ b/drivers/staging/unisys/visorbus/visorchannel.c
    @@ -25,6 +25,7 @@
    #include "version.h"
    #include "visorbus.h"
    #include "controlvmchannel.h"
    +#include "visorbus_private.h"

    #define MYDRVNAME "visorchannel"

    --
    1.9.1
    \
     
     \ /
      Last update: 2016-05-25 06:41    [W:2.087 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site