Commit 246cff65 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

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

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd5f9385
...@@ -52,8 +52,7 @@ struct visorchannel { ...@@ -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, ...@@ -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, ...@@ -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 * ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment