summaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/connection.c
diff options
context:
space:
mode:
authorHaiyang Zhang2011-01-26 21:12:07 +0100
committerGreg Kroah-Hartman2011-01-31 22:42:47 +0100
commit15b2f6479b5c5220848ba159248665d56694d2f9 (patch)
tree9cade6d3be7c58bbc000bd0ca78c88a1e054d034 /drivers/staging/hv/connection.c
parentappletalk: move to staging (diff)
downloadkernel-qcow2-linux-15b2f6479b5c5220848ba159248665d56694d2f9.tar.gz
kernel-qcow2-linux-15b2f6479b5c5220848ba159248665d56694d2f9.tar.xz
kernel-qcow2-linux-15b2f6479b5c5220848ba159248665d56694d2f9.zip
staging: hv: Convert camel cased variables in connection.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/connection.c')
-rw-r--r--drivers/staging/hv/connection.c154
1 files changed, 78 insertions, 76 deletions
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index c2e298ff4834..a30b98deb6a4 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -29,7 +29,7 @@
#include "vmbus_private.h"
-struct VMBUS_CONNECTION gVmbusConnection = {
+struct VMBUS_CONNECTION vmbus_connection = {
.ConnectState = Disconnected,
.NextGpadlHandle = ATOMIC_INIT(0xE1E10),
};
@@ -40,86 +40,86 @@ struct VMBUS_CONNECTION gVmbusConnection = {
int VmbusConnect(void)
{
int ret = 0;
- struct vmbus_channel_msginfo *msgInfo = NULL;
+ struct vmbus_channel_msginfo *msginfo = NULL;
struct vmbus_channel_initiate_contact *msg;
unsigned long flags;
/* Make sure we are not connecting or connected */
- if (gVmbusConnection.ConnectState != Disconnected)
+ if (vmbus_connection.ConnectState != Disconnected)
return -1;
/* Initialize the vmbus connection */
- gVmbusConnection.ConnectState = Connecting;
- gVmbusConnection.WorkQueue = create_workqueue("hv_vmbus_con");
- if (!gVmbusConnection.WorkQueue) {
+ vmbus_connection.ConnectState = Connecting;
+ vmbus_connection.WorkQueue = create_workqueue("hv_vmbus_con");
+ if (!vmbus_connection.WorkQueue) {
ret = -1;
goto Cleanup;
}
- INIT_LIST_HEAD(&gVmbusConnection.ChannelMsgList);
- spin_lock_init(&gVmbusConnection.channelmsg_lock);
+ INIT_LIST_HEAD(&vmbus_connection.ChannelMsgList);
+ spin_lock_init(&vmbus_connection.channelmsg_lock);
- INIT_LIST_HEAD(&gVmbusConnection.ChannelList);
- spin_lock_init(&gVmbusConnection.channel_lock);
+ INIT_LIST_HEAD(&vmbus_connection.ChannelList);
+ spin_lock_init(&vmbus_connection.channel_lock);
/*
* Setup the vmbus event connection for channel interrupt
* abstraction stuff
*/
- gVmbusConnection.InterruptPage = osd_page_alloc(1);
- if (gVmbusConnection.InterruptPage == NULL) {
+ vmbus_connection.InterruptPage = osd_page_alloc(1);
+ if (vmbus_connection.InterruptPage == NULL) {
ret = -1;
goto Cleanup;
}
- gVmbusConnection.RecvInterruptPage = gVmbusConnection.InterruptPage;
- gVmbusConnection.SendInterruptPage =
- (void *)((unsigned long)gVmbusConnection.InterruptPage +
+ vmbus_connection.RecvInterruptPage = vmbus_connection.InterruptPage;
+ vmbus_connection.SendInterruptPage =
+ (void *)((unsigned long)vmbus_connection.InterruptPage +
(PAGE_SIZE >> 1));
/*
* Setup the monitor notification facility. The 1st page for
* parent->child and the 2nd page for child->parent
*/
- gVmbusConnection.MonitorPages = osd_page_alloc(2);
- if (gVmbusConnection.MonitorPages == NULL) {
+ vmbus_connection.MonitorPages = osd_page_alloc(2);
+ if (vmbus_connection.MonitorPages == NULL) {
ret = -1;
goto Cleanup;
}
- msgInfo = kzalloc(sizeof(*msgInfo) +
+ msginfo = kzalloc(sizeof(*msginfo) +
sizeof(struct vmbus_channel_initiate_contact),
GFP_KERNEL);
- if (msgInfo == NULL) {
+ if (msginfo == NULL) {
ret = -ENOMEM;
goto Cleanup;
}
- msgInfo->waitevent = osd_waitevent_create();
- if (!msgInfo->waitevent) {
+ msginfo->waitevent = osd_waitevent_create();
+ if (!msginfo->waitevent) {
ret = -ENOMEM;
goto Cleanup;
}
- msg = (struct vmbus_channel_initiate_contact *)msgInfo->msg;
+ msg = (struct vmbus_channel_initiate_contact *)msginfo->msg;
msg->header.msgtype = CHANNELMSG_INITIATE_CONTACT;
msg->vmbus_version_requested = VMBUS_REVISION_NUMBER;
- msg->interrupt_page = virt_to_phys(gVmbusConnection.InterruptPage);
- msg->monitor_page1 = virt_to_phys(gVmbusConnection.MonitorPages);
+ msg->interrupt_page = virt_to_phys(vmbus_connection.InterruptPage);
+ msg->monitor_page1 = virt_to_phys(vmbus_connection.MonitorPages);
msg->monitor_page2 = virt_to_phys(
- (void *)((unsigned long)gVmbusConnection.MonitorPages +
+ (void *)((unsigned long)vmbus_connection.MonitorPages +
PAGE_SIZE));
/*
* Add to list before we send the request since we may
* receive the response before returning from this routine
*/
- spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
- list_add_tail(&msgInfo->msglistentry,
- &gVmbusConnection.ChannelMsgList);
+ spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
+ list_add_tail(&msginfo->msglistentry,
+ &vmbus_connection.ChannelMsgList);
- spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
+ spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
DPRINT_DBG(VMBUS, "Vmbus connection - interrupt pfn %llx, "
"monitor1 pfn %llx,, monitor2 pfn %llx",
@@ -129,19 +129,19 @@ int VmbusConnect(void)
ret = VmbusPostMessage(msg,
sizeof(struct vmbus_channel_initiate_contact));
if (ret != 0) {
- list_del(&msgInfo->msglistentry);
+ list_del(&msginfo->msglistentry);
goto Cleanup;
}
/* Wait for the connection response */
- osd_waitevent_wait(msgInfo->waitevent);
+ osd_waitevent_wait(msginfo->waitevent);
- list_del(&msgInfo->msglistentry);
+ list_del(&msginfo->msglistentry);
/* Check if successful */
- if (msgInfo->response.version_response.version_supported) {
+ if (msginfo->response.version_response.version_supported) {
DPRINT_INFO(VMBUS, "Vmbus connected!!");
- gVmbusConnection.ConnectState = Connected;
+ vmbus_connection.ConnectState = Connected;
} else {
DPRINT_ERR(VMBUS, "Vmbus connection failed!!..."
@@ -151,29 +151,29 @@ int VmbusConnect(void)
goto Cleanup;
}
- kfree(msgInfo->waitevent);
- kfree(msgInfo);
+ kfree(msginfo->waitevent);
+ kfree(msginfo);
return 0;
Cleanup:
- gVmbusConnection.ConnectState = Disconnected;
+ vmbus_connection.ConnectState = Disconnected;
- if (gVmbusConnection.WorkQueue)
- destroy_workqueue(gVmbusConnection.WorkQueue);
+ if (vmbus_connection.WorkQueue)
+ destroy_workqueue(vmbus_connection.WorkQueue);
- if (gVmbusConnection.InterruptPage) {
- osd_page_free(gVmbusConnection.InterruptPage, 1);
- gVmbusConnection.InterruptPage = NULL;
+ if (vmbus_connection.InterruptPage) {
+ osd_page_free(vmbus_connection.InterruptPage, 1);
+ vmbus_connection.InterruptPage = NULL;
}
- if (gVmbusConnection.MonitorPages) {
- osd_page_free(gVmbusConnection.MonitorPages, 2);
- gVmbusConnection.MonitorPages = NULL;
+ if (vmbus_connection.MonitorPages) {
+ osd_page_free(vmbus_connection.MonitorPages, 2);
+ vmbus_connection.MonitorPages = NULL;
}
- if (msgInfo) {
- kfree(msgInfo->waitevent);
- kfree(msgInfo);
+ if (msginfo) {
+ kfree(msginfo->waitevent);
+ kfree(msginfo);
}
return ret;
@@ -188,7 +188,7 @@ int VmbusDisconnect(void)
struct vmbus_channel_message_header *msg;
/* Make sure we are connected */
- if (gVmbusConnection.ConnectState != Connected)
+ if (vmbus_connection.ConnectState != Connected)
return -1;
msg = kzalloc(sizeof(struct vmbus_channel_message_header), GFP_KERNEL);
@@ -202,12 +202,12 @@ int VmbusDisconnect(void)
if (ret != 0)
goto Cleanup;
- osd_page_free(gVmbusConnection.InterruptPage, 1);
+ osd_page_free(vmbus_connection.InterruptPage, 1);
/* TODO: iterate thru the msg list and free up */
- destroy_workqueue(gVmbusConnection.WorkQueue);
+ destroy_workqueue(vmbus_connection.WorkQueue);
- gVmbusConnection.ConnectState = Disconnected;
+ vmbus_connection.ConnectState = Disconnected;
DPRINT_INFO(VMBUS, "Vmbus disconnected!!");
@@ -219,22 +219,22 @@ Cleanup:
/*
* GetChannelFromRelId - Get the channel object given its child relative id (ie channel id)
*/
-struct vmbus_channel *GetChannelFromRelId(u32 relId)
+struct vmbus_channel *GetChannelFromRelId(u32 relid)
{
struct vmbus_channel *channel;
- struct vmbus_channel *foundChannel = NULL;
+ struct vmbus_channel *found_channel = NULL;
unsigned long flags;
- spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
- list_for_each_entry(channel, &gVmbusConnection.ChannelList, listentry) {
- if (channel->offermsg.child_relid == relId) {
- foundChannel = channel;
+ spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
+ list_for_each_entry(channel, &vmbus_connection.ChannelList, listentry) {
+ if (channel->offermsg.child_relid == relid) {
+ found_channel = channel;
break;
}
}
- spin_unlock_irqrestore(&gVmbusConnection.channel_lock, flags);
+ spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
- return foundChannel;
+ return found_channel;
}
/*
@@ -243,7 +243,7 @@ struct vmbus_channel *GetChannelFromRelId(u32 relId)
static void VmbusProcessChannelEvent(void *context)
{
struct vmbus_channel *channel;
- u32 relId = (u32)(unsigned long)context;
+ u32 relid = (u32)(unsigned long)context;
/* ASSERT(relId > 0); */
@@ -251,7 +251,7 @@ static void VmbusProcessChannelEvent(void *context)
* Find the channel based on this relid and invokes the
* channel callback to process the event
*/
- channel = GetChannelFromRelId(relId);
+ channel = GetChannelFromRelId(relid);
if (channel) {
vmbus_onchannel_event(channel);
@@ -261,7 +261,7 @@ static void VmbusProcessChannelEvent(void *context)
* (void*)channel);
*/
} else {
- DPRINT_ERR(VMBUS, "channel not found for relid - %d.", relId);
+ DPRINT_ERR(VMBUS, "channel not found for relid - %d.", relid);
}
}
@@ -274,14 +274,16 @@ void VmbusOnEvents(void)
int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
int bit;
int relid;
- u32 *recvInterruptPage = gVmbusConnection.RecvInterruptPage;
+ u32 *recv_int_page = vmbus_connection.RecvInterruptPage;
/* Check events */
- if (recvInterruptPage) {
+ if (recv_int_page) {
for (dword = 0; dword < maxdword; dword++) {
- if (recvInterruptPage[dword]) {
+ if (recv_int_page[dword]) {
for (bit = 0; bit < 32; bit++) {
- if (test_and_clear_bit(bit, (unsigned long *)&recvInterruptPage[dword])) {
+ if (test_and_clear_bit(bit,
+ (unsigned long *)
+ &recv_int_page[dword])) {
relid = (dword << 5) + bit;
DPRINT_DBG(VMBUS, "event detected for relid - %d", relid);
@@ -305,24 +307,24 @@ void VmbusOnEvents(void)
/*
* VmbusPostMessage - Send a msg on the vmbus's message connection
*/
-int VmbusPostMessage(void *buffer, size_t bufferLen)
+int VmbusPostMessage(void *buffer, size_t buflen)
{
- union hv_connection_id connId;
+ union hv_connection_id conn_id;
- connId.asu32 = 0;
- connId.u.id = VMBUS_MESSAGE_CONNECTION_ID;
- return hv_post_message(connId, 1, buffer, bufferLen);
+ conn_id.asu32 = 0;
+ conn_id.u.id = VMBUS_MESSAGE_CONNECTION_ID;
+ return hv_post_message(conn_id, 1, buffer, buflen);
}
/*
* VmbusSetEvent - Send an event notification to the parent
*/
-int VmbusSetEvent(u32 childRelId)
+int VmbusSetEvent(u32 child_relid)
{
/* Each u32 represents 32 channels */
- set_bit(childRelId & 31,
- (unsigned long *)gVmbusConnection.SendInterruptPage +
- (childRelId >> 5));
+ set_bit(child_relid & 31,
+ (unsigned long *)vmbus_connection.SendInterruptPage +
+ (child_relid >> 5));
return hv_signal_event();
}