a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: Change Cleanup to cleanup in connection.c

Browse Source 
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-05-10 07:55:44 -07:00 committed by Greg Kroah-Hartman
parent 4b599df0ca
commit b0043863a0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/hv/connection.c
View File

@ -58,7 +58,7 @@ int vmbus_connect(void)
vmbus_connection.work_queue = create_workqueue("hv_vmbus_con"); vmbus_connection.work_queue = create_workqueue("hv_vmbus_con");
if (!vmbus_connection.work_queue) { if (!vmbus_connection.work_queue) {
ret = -1; ret = -1;
goto Cleanup; goto cleanup;
} }
INIT_LIST_HEAD(&vmbus_connection.chn_msg_list); INIT_LIST_HEAD(&vmbus_connection.chn_msg_list);
@ -75,7 +75,7 @@ int vmbus_connect(void)
(void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, 0); (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, 0);
if (vmbus_connection.int_page == NULL) { if (vmbus_connection.int_page == NULL) {
ret = -1; ret = -1;
goto Cleanup; goto cleanup;
} }
vmbus_connection.recv_int_page = vmbus_connection.int_page; vmbus_connection.recv_int_page = vmbus_connection.int_page;
@ -91,7 +91,7 @@ int vmbus_connect(void)
(void *)__get_free_pages((GFP_KERNEL|__GFP_ZERO), 1); (void *)__get_free_pages((GFP_KERNEL|__GFP_ZERO), 1);
if (vmbus_connection.monitor_pages == NULL) { if (vmbus_connection.monitor_pages == NULL) {
ret = -1; ret = -1;
goto Cleanup; goto cleanup;
} }
msginfo = kzalloc(sizeof(*msginfo) + msginfo = kzalloc(sizeof(*msginfo) +
@ -99,7 +99,7 @@ int vmbus_connect(void)
GFP_KERNEL); GFP_KERNEL);
if (msginfo == NULL) { if (msginfo == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto Cleanup; goto cleanup;
} }
init_completion(&msginfo->waitevent); init_completion(&msginfo->waitevent);
@ -131,7 +131,7 @@ int vmbus_connect(void)
list_del(&msginfo->msglistentry); list_del(&msginfo->msglistentry);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock,
flags); flags);
goto Cleanup; goto cleanup;
} }
/* Wait for the connection response */ /* Wait for the connection response */
@ -143,7 +143,7 @@ int vmbus_connect(void)
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock,
flags); flags);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto Cleanup; goto cleanup;
} }
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
@ -158,13 +158,13 @@ int vmbus_connect(void)
"Version %d not supported by Hyper-V\n", "Version %d not supported by Hyper-V\n",
VMBUS_REVISION_NUMBER); VMBUS_REVISION_NUMBER);
ret = -1; ret = -1;
goto Cleanup; goto cleanup;
} }
kfree(msginfo); kfree(msginfo);
return 0; return 0;
Cleanup: cleanup:
vmbus_connection.conn_state = DISCONNECTED; vmbus_connection.conn_state = DISCONNECTED;
if (vmbus_connection.work_queue) if (vmbus_connection.work_queue)
@ -207,7 +207,7 @@ int vmbus_disconnect(void)
ret = vmbus_post_msg(msg, ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header)); sizeof(struct vmbus_channel_message_header));
if (ret != 0) if (ret != 0)
goto Cleanup; goto cleanup;
free_pages((unsigned long)vmbus_connection.int_page, 0); free_pages((unsigned long)vmbus_connection.int_page, 0);
free_pages((unsigned long)vmbus_connection.monitor_pages, 1); free_pages((unsigned long)vmbus_connection.monitor_pages, 1);
@ -219,7 +219,7 @@ int vmbus_disconnect(void)
pr_info("hv_vmbus disconnected\n"); pr_info("hv_vmbus disconnected\n");
Cleanup: cleanup:
kfree(msg); kfree(msg);
return ret; return ret;
} }