提交 c6977677 编写于 作者: H Haiyang Zhang 提交者: Greg Kroah-Hartman

staging: hv: Convert camel cased functions in connection.c to lower cases

Signed-off-by: NHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: NHank Janssen <hjanssen@microsoft.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 15b2f647
...@@ -88,7 +88,7 @@ static void vmbus_setevent(struct vmbus_channel *channel) ...@@ -88,7 +88,7 @@ static void vmbus_setevent(struct vmbus_channel *channel)
[channel->monitor_grp].pending); [channel->monitor_grp].pending);
} else { } else {
VmbusSetEvent(channel->offermsg.child_relid); vmbus_set_event(channel->offermsg.child_relid);
} }
} }
...@@ -272,7 +272,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, ...@@ -272,7 +272,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
DPRINT_DBG(VMBUS, "Sending channel open msg..."); DPRINT_DBG(VMBUS, "Sending channel open msg...");
ret = VmbusPostMessage(openMsg, ret = vmbus_post_msg(openMsg,
sizeof(struct vmbus_channel_open_channel)); sizeof(struct vmbus_channel_open_channel));
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(VMBUS, "unable to open channel - %d", ret); DPRINT_ERR(VMBUS, "unable to open channel - %d", ret);
...@@ -532,7 +532,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, ...@@ -532,7 +532,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
DPRINT_DBG(VMBUS, "Sending GPADL Header - len %zd", DPRINT_DBG(VMBUS, "Sending GPADL Header - len %zd",
msginfo->msgsize - sizeof(*msginfo)); msginfo->msgsize - sizeof(*msginfo));
ret = VmbusPostMessage(gpadlmsg, msginfo->msgsize - ret = vmbus_post_msg(gpadlmsg, msginfo->msgsize -
sizeof(*msginfo)); sizeof(*msginfo));
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(VMBUS, "Unable to open channel - %d", ret); DPRINT_ERR(VMBUS, "Unable to open channel - %d", ret);
...@@ -557,7 +557,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, ...@@ -557,7 +557,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
dump_gpadl_body(gpadl_body, submsginfo->msgsize - dump_gpadl_body(gpadl_body, submsginfo->msgsize -
sizeof(*submsginfo)); sizeof(*submsginfo));
ret = VmbusPostMessage(gpadl_body, ret = vmbus_post_msg(gpadl_body,
submsginfo->msgsize - submsginfo->msgsize -
sizeof(*submsginfo)); sizeof(*submsginfo));
if (ret != 0) if (ret != 0)
...@@ -621,7 +621,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) ...@@ -621,7 +621,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
&vmbus_connection.ChannelMsgList); &vmbus_connection.ChannelMsgList);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
ret = VmbusPostMessage(msg, ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_gpadl_teardown)); sizeof(struct vmbus_channel_gpadl_teardown));
if (ret != 0) { if (ret != 0) {
/* TODO: */ /* TODO: */
...@@ -669,7 +669,7 @@ void vmbus_close(struct vmbus_channel *channel) ...@@ -669,7 +669,7 @@ void vmbus_close(struct vmbus_channel *channel)
msg->header.msgtype = CHANNELMSG_CLOSECHANNEL; msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
msg->child_relid = channel->offermsg.child_relid; msg->child_relid = channel->offermsg.child_relid;
ret = VmbusPostMessage(msg, sizeof(struct vmbus_channel_close_channel)); ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel));
if (ret != 0) { if (ret != 0) {
/* TODO: */ /* TODO: */
/* something... */ /* something... */
......
...@@ -532,7 +532,7 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) ...@@ -532,7 +532,7 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
struct vmbus_channel *channel; struct vmbus_channel *channel;
rescind = (struct vmbus_channel_rescind_offer *)hdr; rescind = (struct vmbus_channel_rescind_offer *)hdr;
channel = GetChannelFromRelId(rescind->child_relid); channel = relid2channel(rescind->child_relid);
if (channel == NULL) { if (channel == NULL) {
DPRINT_DBG(VMBUS, "channel not found for relId %d", DPRINT_DBG(VMBUS, "channel not found for relId %d",
rescind->child_relid); rescind->child_relid);
...@@ -820,7 +820,7 @@ int vmbus_request_offers(void) ...@@ -820,7 +820,7 @@ int vmbus_request_offers(void)
&msgInfo->msgListEntry); &msgInfo->msgListEntry);
SpinlockRelease(gVmbusConnection.channelMsgLock);*/ SpinlockRelease(gVmbusConnection.channelMsgLock);*/
ret = VmbusPostMessage(msg, ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header)); sizeof(struct vmbus_channel_message_header));
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(VMBUS, "Unable to request offers - %d", ret); DPRINT_ERR(VMBUS, "Unable to request offers - %d", ret);
......
...@@ -35,9 +35,9 @@ struct VMBUS_CONNECTION vmbus_connection = { ...@@ -35,9 +35,9 @@ struct VMBUS_CONNECTION vmbus_connection = {
}; };
/* /*
* VmbusConnect - Sends a connect request on the partition service connection * vmbus_connect - Sends a connect request on the partition service connection
*/ */
int VmbusConnect(void) int vmbus_connect(void)
{ {
int ret = 0; int ret = 0;
struct vmbus_channel_msginfo *msginfo = NULL; struct vmbus_channel_msginfo *msginfo = NULL;
...@@ -126,7 +126,7 @@ int VmbusConnect(void) ...@@ -126,7 +126,7 @@ int VmbusConnect(void)
msg->interrupt_page, msg->monitor_page1, msg->monitor_page2); msg->interrupt_page, msg->monitor_page1, msg->monitor_page2);
DPRINT_DBG(VMBUS, "Sending channel initiate msg..."); DPRINT_DBG(VMBUS, "Sending channel initiate msg...");
ret = VmbusPostMessage(msg, ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_initiate_contact)); sizeof(struct vmbus_channel_initiate_contact));
if (ret != 0) { if (ret != 0) {
list_del(&msginfo->msglistentry); list_del(&msginfo->msglistentry);
...@@ -180,9 +180,10 @@ Cleanup: ...@@ -180,9 +180,10 @@ Cleanup:
} }
/* /*
* VmbusDisconnect - Sends a disconnect request on the partition service connection * vmbus_disconnect -
* Sends a disconnect request on the partition service connection
*/ */
int VmbusDisconnect(void) int vmbus_disconnect(void)
{ {
int ret = 0; int ret = 0;
struct vmbus_channel_message_header *msg; struct vmbus_channel_message_header *msg;
...@@ -197,7 +198,7 @@ int VmbusDisconnect(void) ...@@ -197,7 +198,7 @@ int VmbusDisconnect(void)
msg->msgtype = CHANNELMSG_UNLOAD; msg->msgtype = CHANNELMSG_UNLOAD;
ret = VmbusPostMessage(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;
...@@ -217,9 +218,10 @@ Cleanup: ...@@ -217,9 +218,10 @@ Cleanup:
} }
/* /*
* GetChannelFromRelId - Get the channel object given its child relative id (ie channel id) * relid2channel - Get the channel object given its
* child relative id (ie channel id)
*/ */
struct vmbus_channel *GetChannelFromRelId(u32 relid) struct vmbus_channel *relid2channel(u32 relid)
{ {
struct vmbus_channel *channel; struct vmbus_channel *channel;
struct vmbus_channel *found_channel = NULL; struct vmbus_channel *found_channel = NULL;
...@@ -238,9 +240,9 @@ struct vmbus_channel *GetChannelFromRelId(u32 relid) ...@@ -238,9 +240,9 @@ struct vmbus_channel *GetChannelFromRelId(u32 relid)
} }
/* /*
* VmbusProcessChannelEvent - Process a channel event notification * process_chn_event - Process a channel event notification
*/ */
static void VmbusProcessChannelEvent(void *context) static void process_chn_event(void *context)
{ {
struct vmbus_channel *channel; struct vmbus_channel *channel;
u32 relid = (u32)(unsigned long)context; u32 relid = (u32)(unsigned long)context;
...@@ -251,7 +253,7 @@ static void VmbusProcessChannelEvent(void *context) ...@@ -251,7 +253,7 @@ static void VmbusProcessChannelEvent(void *context)
* Find the channel based on this relid and invokes the * Find the channel based on this relid and invokes the
* channel callback to process the event * channel callback to process the event
*/ */
channel = GetChannelFromRelId(relid); channel = relid2channel(relid);
if (channel) { if (channel) {
vmbus_onchannel_event(channel); vmbus_onchannel_event(channel);
...@@ -266,9 +268,9 @@ static void VmbusProcessChannelEvent(void *context) ...@@ -266,9 +268,9 @@ static void VmbusProcessChannelEvent(void *context)
} }
/* /*
* VmbusOnEvents - Handler for events * vmbus_on_event - Handler for events
*/ */
void VmbusOnEvents(void) void vmbus_on_event(void)
{ {
int dword; int dword;
int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5; int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
...@@ -294,7 +296,8 @@ void VmbusOnEvents(void) ...@@ -294,7 +296,8 @@ void VmbusOnEvents(void)
} else { } else {
/* QueueWorkItem(VmbusProcessEvent, (void*)relid); */ /* QueueWorkItem(VmbusProcessEvent, (void*)relid); */
/* ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid); */ /* ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid); */
VmbusProcessChannelEvent((void *)(unsigned long)relid); process_chn_event((void *)
(unsigned long)relid);
} }
} }
} }
...@@ -305,9 +308,9 @@ void VmbusOnEvents(void) ...@@ -305,9 +308,9 @@ void VmbusOnEvents(void)
} }
/* /*
* VmbusPostMessage - Send a msg on the vmbus's message connection * vmbus_post_msg - Send a msg on the vmbus's message connection
*/ */
int VmbusPostMessage(void *buffer, size_t buflen) int vmbus_post_msg(void *buffer, size_t buflen)
{ {
union hv_connection_id conn_id; union hv_connection_id conn_id;
...@@ -317,9 +320,9 @@ int VmbusPostMessage(void *buffer, size_t buflen) ...@@ -317,9 +320,9 @@ int VmbusPostMessage(void *buffer, size_t buflen)
} }
/* /*
* VmbusSetEvent - Send an event notification to the parent * vmbus_set_event - Send an event notification to the parent
*/ */
int VmbusSetEvent(u32 child_relid) int vmbus_set_event(u32 child_relid)
{ {
/* Each u32 represents 32 channels */ /* Each u32 represents 32 channels */
set_bit(child_relid & 31, set_bit(child_relid & 31,
......
...@@ -174,7 +174,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo) ...@@ -174,7 +174,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
on_each_cpu(hv_synic_init, (void *)irqvector, 1); on_each_cpu(hv_synic_init, (void *)irqvector, 1);
/* Connect to VMBus in the root partition */ /* Connect to VMBus in the root partition */
ret = VmbusConnect(); ret = vmbus_connect();
/* VmbusSendEvent(device->localPortId+1); */ /* VmbusSendEvent(device->localPortId+1); */
return ret; return ret;
...@@ -188,7 +188,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev) ...@@ -188,7 +188,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
int ret = 0; int ret = 0;
vmbus_release_unattached_channels(); vmbus_release_unattached_channels();
VmbusDisconnect(); vmbus_disconnect();
on_each_cpu(hv_synic_cleanup, NULL, 1); on_each_cpu(hv_synic_cleanup, NULL, 1);
return ret; return ret;
} }
...@@ -1045,7 +1045,7 @@ static void vmbus_msg_dpc(unsigned long data) ...@@ -1045,7 +1045,7 @@ static void vmbus_msg_dpc(unsigned long data)
static void vmbus_event_dpc(unsigned long data) static void vmbus_event_dpc(unsigned long data)
{ {
/* Call to bus driver to handle interrupt */ /* Call to bus driver to handle interrupt */
VmbusOnEvents(); vmbus_on_event();
} }
static irqreturn_t vmbus_isr(int irq, void *dev_id) static irqreturn_t vmbus_isr(int irq, void *dev_id)
......
...@@ -115,20 +115,20 @@ void vmbus_child_device_unregister(struct hv_device *device_obj); ...@@ -115,20 +115,20 @@ void vmbus_child_device_unregister(struct hv_device *device_obj);
/* VmbusChildDeviceDestroy( */ /* VmbusChildDeviceDestroy( */
/* struct hv_device *); */ /* struct hv_device *); */
struct vmbus_channel *GetChannelFromRelId(u32 relId); struct vmbus_channel *relid2channel(u32 relid);
/* Connection interface */ /* Connection interface */
int VmbusConnect(void); int vmbus_connect(void);
int VmbusDisconnect(void); int vmbus_disconnect(void);
int VmbusPostMessage(void *buffer, size_t bufSize); int vmbus_post_msg(void *buffer, size_t buflen);
int VmbusSetEvent(u32 childRelId); int vmbus_set_event(u32 child_relid);
void VmbusOnEvents(void); void vmbus_on_event(void);
#endif /* _VMBUS_PRIVATE_H_ */ #endif /* _VMBUS_PRIVATE_H_ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册