evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: memregion: Eliminate visor_memregion_resize()

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:51 -04:00 • committed by Greg Kroah-Hartman
parent 0dbb3fb66b
commit 81b6032f46
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/unisys/visorbus/visorchannel.c
View file

@ -89,10 +89,23 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
if (uuid_le_cmp(guid, NULL_UUID_LE) == 0) if (uuid_le_cmp(guid, NULL_UUID_LE) == 0)
guid = channel->chan_hdr.chtype; guid = channel->chan_hdr.chtype;
err = visor_memregion_resize(&channel->memregion, channel_bytes); iounmap(channel->memregion.mapped);
if (err) release_mem_region(channel->memregion.physaddr,
channel->memregion.nbytes);
channel->memregion.mapped = NULL;
if (!request_mem_region(channel->memregion.physaddr, channel_bytes,
MYDRVNAME))
goto cleanup; goto cleanup;
channel->memregion.mapped = ioremap_cache(channel->memregion.physaddr,
channel_bytes);
if (!channel->memregion.mapped) {
release_mem_region(channel->memregion.physaddr, channel_bytes);
goto cleanup;
}
channel->memregion.nbytes = channel_bytes;
channel->size = channel_bytes; channel->size = channel_bytes;
channel->guid = guid; channel->guid = guid;
return channel; return channel;

1
drivers/staging/unisys/visorutil/memregion.h
View file

@ -29,7 +29,6 @@ struct memregion {
void __iomem *mapped; void __iomem *mapped;
}; };
int visor_memregion_resize(struct memregion *memregion, ulong newsize);
int visor_memregion_read(struct memregion *memregion, int visor_memregion_read(struct memregion *memregion,
ulong offset, void *dest, ulong nbytes); ulong offset, void *dest, ulong nbytes);
int visor_memregion_write(struct memregion *memregion, int visor_memregion_write(struct memregion *memregion,

16
drivers/staging/unisys/visorutil/memregion_direct.c
View file

@ -76,22 +76,6 @@ visor_memregion_get_pointer(struct memregion *memregion)
} }
EXPORT_SYMBOL_GPL(visor_memregion_get_pointer); EXPORT_SYMBOL_GPL(visor_memregion_get_pointer);
int
visor_memregion_resize(struct memregion *memregion, ulong newsize)
{
int rc;
if (newsize == memregion->nbytes)
return 0;
unmapit(memregion);
memregion->nbytes = newsize;
rc = mapit(memregion);
return rc;
}
EXPORT_SYMBOL_GPL(visor_memregion_resize);
int int
visor_memregion_read(struct memregion *memregion, ulong offset, void *dest, visor_memregion_read(struct memregion *memregion, ulong offset, void *dest,
ulong nbytes) ulong nbytes)