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

staging: unisys: memregion: Eliminate unnecessary 'requested' flag

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:24 -04:00 • committed by Greg Kroah-Hartman
parent 1bd14f3704
commit 75d1e6613c
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,6 @@ struct memregion {
HOSTADDRESS physaddr; HOSTADDRESS physaddr;
ulong nbytes; ulong nbytes;
void __iomem *mapped; void __iomem *mapped;
BOOL requested;
}; };
static int mapit(struct memregion *memregion); static int mapit(struct memregion *memregion);
@ -67,16 +66,12 @@ mapit(struct memregion *memregion)
ulong physaddr = (ulong)(memregion->physaddr); ulong physaddr = (ulong)(memregion->physaddr);
ulong nbytes = memregion->nbytes; ulong nbytes = memregion->nbytes;
memregion->requested = FALSE;
if (!request_mem_region(physaddr, nbytes, MYDRVNAME)) if (!request_mem_region(physaddr, nbytes, MYDRVNAME))
return -EBUSY; return -EBUSY;
memregion->requested = TRUE;
memregion->mapped = ioremap_cache(physaddr, nbytes); memregion->mapped = ioremap_cache(physaddr, nbytes);
if (!memregion->mapped) { if (!memregion->mapped)
memregion->requested = TRUE;
return -EFAULT; return -EFAULT;
}
return 0; return 0;
} }
@ -84,14 +79,11 @@ mapit(struct memregion *memregion)
static void static void
unmapit(struct memregion *memregion) unmapit(struct memregion *memregion)
{ {
if (memregion->mapped != NULL) { if (memregion->mapped) {
iounmap(memregion->mapped); iounmap(memregion->mapped);
memregion->mapped = NULL; memregion->mapped = NULL;
} release_mem_region((unsigned long)memregion->physaddr,
if (memregion->requested) {
release_mem_region((ulong)(memregion->physaddr),
memregion->nbytes); memregion->nbytes);
memregion->requested = FALSE;
} }
} }