openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorbus: visorchannel_create_guts() always has parent == NULL 

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:21 -04:00 committed by Greg Kroah-Hartman
parent dd5f93851c
commit 246cff65a0
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,7 @@ struct visorchannel {
*/ */
static struct visorchannel * static struct visorchannel *
visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes, visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
struct visorchannel *parent, ulong off, uuid_le guid, ulong off, uuid_le guid, BOOL needs_lock)
BOOL needs_lock)
{ {
struct visorchannel *channel; struct visorchannel *channel;
int err; int err;
@ -70,11 +69,8 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
spin_lock_init(&channel->remove_lock); spin_lock_init(&channel->remove_lock);
/* prepare chan_hdr (abstraction to read/write channel memory) */ /* prepare chan_hdr (abstraction to read/write channel memory) */
if (!parent) memregion = visor_memregion_create(physaddr, size);
memregion = visor_memregion_create(physaddr, size);
else
memregion = visor_memregion_create_overlapped(parent->memregion,
off, size);
if (!memregion) if (!memregion)
goto cleanup; goto cleanup;
channel->memregion = memregion; channel->memregion = memregion;
@ -106,7 +102,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
struct visorchannel * struct visorchannel *
visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid) visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid)
{ {
return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid, return visorchannel_create_guts(physaddr, channel_bytes, 0, guid,
FALSE); FALSE);
} }
EXPORT_SYMBOL_GPL(visorchannel_create); EXPORT_SYMBOL_GPL(visorchannel_create);
@ -115,7 +111,7 @@ struct visorchannel *
visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes, visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes,
uuid_le guid) uuid_le guid)
{ {
return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid, return visorchannel_create_guts(physaddr, channel_bytes, 0, guid,
TRUE); TRUE);
} }
EXPORT_SYMBOL_GPL(visorchannel_create_with_lock); EXPORT_SYMBOL_GPL(visorchannel_create_with_lock);