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

staging: unisys: visorbus: cleanup gotos in visorchannel_create_guts 

Away label is ambiguous change to it err_destroy_channel to make it
clear this is an error path.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Timothy Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-03-08 21:28:27 -05:00 committed by Greg Kroah-Hartman
parent afd14cef01
commit 5bf49a6c74
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
channel = kzalloc(sizeof(*channel), gfp); channel = kzalloc(sizeof(*channel), gfp);
if (!channel) if (!channel)
goto cleanup; return NULL;
channel->needs_lock = needs_lock; channel->needs_lock = needs_lock;
spin_lock_init(&channel->insert_lock); spin_lock_init(&channel->insert_lock);
@ -89,14 +89,14 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
if (!channel->requested) { if (!channel->requested) {
if (uuid_le_cmp(guid, spar_video_guid)) { if (uuid_le_cmp(guid, spar_video_guid)) {
/* Not the video channel we care about this */ /* Not the video channel we care about this */
goto cleanup; goto err_destroy_channel;
} }
} }
channel->mapped = memremap(physaddr, size, MEMREMAP_WB); channel->mapped = memremap(physaddr, size, MEMREMAP_WB);
if (!channel->mapped) { if (!channel->mapped) {
release_mem_region(physaddr, size); release_mem_region(physaddr, size);
goto cleanup; goto err_destroy_channel;
} }
channel->physaddr = physaddr; channel->physaddr = physaddr;
@ -105,7 +105,7 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
err = visorchannel_read(channel, 0, &channel->chan_hdr, err = visorchannel_read(channel, 0, &channel->chan_hdr,
sizeof(struct channel_header)); sizeof(struct channel_header));
if (err) if (err)
goto cleanup; goto err_destroy_channel;
/* we had better be a CLIENT of this channel */ /* we had better be a CLIENT of this channel */
if (channel_bytes == 0) if (channel_bytes == 0)
@ -122,7 +122,7 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
if (!channel->requested) { if (!channel->requested) {
if (uuid_le_cmp(guid, spar_video_guid)) { if (uuid_le_cmp(guid, spar_video_guid)) {
/* Different we care about this */ /* Different we care about this */
goto cleanup; goto err_destroy_channel;
} }
} }
@ -130,7 +130,7 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
MEMREMAP_WB); MEMREMAP_WB);
if (!channel->mapped) { if (!channel->mapped) {
release_mem_region(channel->physaddr, channel_bytes); release_mem_region(channel->physaddr, channel_bytes);
goto cleanup; goto err_destroy_channel;
} }
channel->nbytes = channel_bytes; channel->nbytes = channel_bytes;
@ -139,7 +139,7 @@ visorchannel_create_guts(u64 physaddr, unsigned long channel_bytes,
channel->guid = guid; channel->guid = guid;
return channel; return channel;
cleanup: err_destroy_channel:
visorchannel_destroy(channel); visorchannel_destroy(channel);
return NULL; return NULL;
} }