diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2015-05-05 18:36:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-08 15:27:29 +0200 |
| commit | 6fa981b4cca312cab0df77c59ed1269b3333b36a (patch) | |
| tree | c3d7392947ed90b794e980403049a574655dba8f /drivers/staging | |
| parent | 81b6032f46ee55af6b786065faf0f35f9c756b97 (diff) | |
staging: unisys: memregion: Eliminate visor_memregion_get_*() functions
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorchannel.c | 7 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorutil/memregion.h | 3 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorutil/memregion_direct.c | 21 |
3 files changed, 3 insertions, 28 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c index cfbb19f78139..bf2f17ac8e97 100644 --- a/drivers/staging/unisys/visorbus/visorchannel.c +++ b/drivers/staging/unisys/visorbus/visorchannel.c @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(visorchannel_destroy); HOSTADDRESS visorchannel_get_physaddr(struct visorchannel *channel) { - return visor_memregion_get_physaddr(&channel->memregion); + return channel->memregion.physaddr; } EXPORT_SYMBOL_GPL(visorchannel_get_physaddr); @@ -501,7 +501,6 @@ visorchannel_debug(struct visorchannel *channel, int num_queues, { HOSTADDRESS addr = 0; ulong nbytes = 0, nbytes_region = 0; - struct memregion *memregion = NULL; struct channel_header hdr; struct channel_header *phdr = &hdr; int i = 0; @@ -510,8 +509,8 @@ visorchannel_debug(struct visorchannel *channel, int num_queues, if (!channel) return; - addr = visor_memregion_get_physaddr(memregion); - nbytes_region = visor_memregion_get_nbytes(memregion); + addr = visorchannel_get_physaddr(channel); + nbytes_region = visorchannel_get_nbytes(channel); errcode = visorchannel_read(channel, off, phdr, sizeof(struct channel_header)); if (errcode < 0) { diff --git a/drivers/staging/unisys/visorutil/memregion.h b/drivers/staging/unisys/visorutil/memregion.h index 57d617f90129..68939371f2ba 100644 --- a/drivers/staging/unisys/visorutil/memregion.h +++ b/drivers/staging/unisys/visorutil/memregion.h @@ -33,10 +33,7 @@ int visor_memregion_read(struct memregion *memregion, ulong offset, void *dest, ulong nbytes); int visor_memregion_write(struct memregion *memregion, ulong offset, void *src, ulong nbytes); -HOSTADDRESS visor_memregion_get_physaddr(struct memregion *memregion); -ulong visor_memregion_get_nbytes(struct memregion *memregion); void memregion_dump(struct memregion *memregion, char *s, ulong off, ulong len, struct seq_file *seq); -void __iomem *visor_memregion_get_pointer(struct memregion *memregion); #endif diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c b/drivers/staging/unisys/visorutil/memregion_direct.c index fa7a4060c20c..238e62f68204 100644 --- a/drivers/staging/unisys/visorutil/memregion_direct.c +++ b/drivers/staging/unisys/visorutil/memregion_direct.c @@ -55,27 +55,6 @@ unmapit(struct memregion *memregion) } } -HOSTADDRESS -visor_memregion_get_physaddr(struct memregion *memregion) -{ - return memregion->physaddr; -} -EXPORT_SYMBOL_GPL(visor_memregion_get_physaddr); - -ulong -visor_memregion_get_nbytes(struct memregion *memregion) -{ - return memregion->nbytes; -} -EXPORT_SYMBOL_GPL(visor_memregion_get_nbytes); - -void __iomem * -visor_memregion_get_pointer(struct memregion *memregion) -{ - return memregion->mapped; -} -EXPORT_SYMBOL_GPL(visor_memregion_get_pointer); - int visor_memregion_read(struct memregion *memregion, ulong offset, void *dest, ulong nbytes) |