leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: unisys: memregion: Eliminate visor_memregion_get_*() functions

Browse Source 
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>
This commit is contained in:
Jes Sorensen 2015-05-05 18:36:52 -04:00 committed by Greg Kroah-Hartman
parent 81b6032f46
commit 6fa981b4cc
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/unisys/visorbus/visorchannel.c
View File

@ -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) {

3
drivers/staging/unisys/visorutil/memregion.h
View File

@ -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

21
drivers/staging/unisys/visorutil/memregion_direct.c
View File

@ -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)