From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756395AbcEYDwX (ORCPT ); Tue, 24 May 2016 23:52:23 -0400 Received: from mail1.bemta8.messagelabs.com ([216.82.243.196]:43709 "EHLO mail1.bemta8.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755210AbcEYDqj (ORCPT ); Tue, 24 May 2016 23:46:39 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsVywNY2Q1dOwTX cYPsnDouFbUtYLC7vmsPmwOTxeZNcAGMUa2ZeUn5FAmvGr+bvzAVvVSt+PX7L3sA4XbGLkYtD SGA3o8Ss2R3sEM4BIGfDZWYI5zKjxPu335kgnHWMEhv3foJytjBKdO1+yNrFyMnBJmAgMfPOX XYQW0TgPIvE01u5ILawQJLEzC+zGLsYOThYBFQlXp1QBwnzCnhJrPt2EKxVQkBO4uSxyWA2J1 B8Q8M3JhBbSMBT4v3tBlYIW03i8NlHbBD1wRKLn65ghZgjKHFy5hMWEJtZQELi4IsXzBMYBWc hSc1CklrAyLSKUaM4tagstUjXyEgvqSgzPaMkNzEzR9fQwEIvN7W4ODE9NScxqVgvOT93EyMw WOsZGBh3MO4+736IUZKDSUmU9+ATl3AhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErwL5FzDhQSLU tNTK9Iyc4BxA5OW4OBREuEtBknzFhck5hZnpkOkTjEqSonz5oEkBEASGaV5cG2wWL3EKCslzM vIwMAgxFOQWpSbWYIq/4pRnINRSZh3B8gUnsy8Erjpr4AWMwEt9v/iDLK4JBEhJdXAqHdk4e6 Slw/dliXsCMkS+6TrZvfcc7ccT9bhV7euK87Ut73odM2t+enbk3Vr/hjMYdq8L6nirsfcnBO6 YawLmmK+PDrY9XhVNMcUhVm3z797tPxuQbzh7sYjivHc0vWFSc8XfPM80jjv2XQeJYZfbincP Bo1E3MKE52fRRrdsrk56eSEmesPFimxFGckGmoxFxUnAgA5ZtEE0AIAAA== X-Env-Sender: David.Kershner@unisys.com X-Msg-Ref: server-15.tower-45.messagelabs.com!1464147994!23114445!13 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 19/24] staging: unisys: visorbus: Move visorbus-unique functions to private header Date: Tue, 24 May 2016 23:45:57 -0400 Message-ID: <1464147962-26650-20-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464147962-26650-1-git-send-email-david.kershner@unisys.com> References: <1464147962-26650-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 25 May 2016 03:46:25.0952 (UTC) FILETIME=[0341C200:01D1B638] 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 From: David Binder Moves function prototypes that are unique to visorbus from include/visorbus.h to visorbus/visorbus_private.h. Signed-off-by: David Binder Signed-off-by: David Kershner --- 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() - * and 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() + * and 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