From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757369AbcFACdR (ORCPT ); Tue, 31 May 2016 22:33:17 -0400 Received: from mail1.bemta8.messagelabs.com ([216.82.243.197]:54378 "EHLO mail1.bemta8.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757221AbcFAC1X (ORCPT ); Tue, 31 May 2016 22:27:23 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsVywNY2Q5fVwy/ cYPcVZYuFbUtYLC7vmsPmwOTxeZNcAGMUa2ZeUn5FAmvGz22n2QvmqlVMmv2eqYHxsGIXIxeH kMBuRone46tZuxg5gZwDjBKH7npAJC4zSly6sIcFwlnHKLGp7T8bhLOFUWLK3GssIC1sAgYSM +/cZQexRQTOs0g8vZULYgsLpEpM/t3KBGKzCKhKzL98HczmFfCSmLn7OJgtISAncfLYZLDVnE DxrZPfM0Kc4SnR/PAflK0mcfjsIzaI+mCJjcvPsEPMEZQ4OfMJ2A3MAhISB1+8YJ7AKDgLSWo WktQCRqZVjBrFqUVlqUW6hgZ6SUWZ6RkluYmZOUCehV5uanFxYnpqTmJSsV5yfu4mRmCwMgDB Dsb1rc6HGCU5mJREeX+4+IUL8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBlcgfKCRalpqdWpGXmA OMGJi3BwaMkApHmLS5IzC3OTIdInWJUlBLnZQFJCIAkMkrz4NpgsXqJUVZKmJcR6BAhnoLUot zMElT5V4ziHIxKwryWIFN4MvNK4Ka/AlrMBLQ4PsMHZHFJIkJKqoFxwtzLxx4d9VxsGRopWuO 4iLVTdKXY9K6Wz3vuhP1Tcra+9Nh0SUP6oiCjvW+OqHXt0F5V8yz5/B3O1KZalQzpZf+mCTxV NLuz/IKMiLHuZnXxw3VTv6y5cd5hxcmf3lse1HgztUYdOXdtw0HZELbaOx+OC0Zf9efpvTBb4 HaTez9bxmN/nS27lViKMxINtZiLihMB064cKtACAAA= X-Env-Sender: David.Kershner@unisys.com X-Msg-Ref: server-16.tower-99.messagelabs.com!1464748033!14853395!18 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 22/27] staging: unisys: visorbus: Move visorbus-unique functions to private header Date: Tue, 31 May 2016 22:26:48 -0400 Message-ID: <1464748013-31309-23-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:04.0644 (UTC) FILETIME=[16301040: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 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 Reviewed-by: Tim Sell --- 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