Skip to content

Commit

Permalink
staging: hv: Convert camel cased functions in connection.c to lower c…
Browse files Browse the repository at this point in the history 
…ases

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>
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Jan 31, 2011
1 parent 15b2f64 commit c697767
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 35 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/hv/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static void vmbus_setevent(struct vmbus_channel *channel)
[channel->monitor_grp].pending);

} else {
VmbusSetEvent(channel->offermsg.child_relid);
vmbus_set_event(channel->offermsg.child_relid);
}
}

Expand Down Expand Up @@ -272,7 +272,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,

DPRINT_DBG(VMBUS, "Sending channel open msg...");

ret = VmbusPostMessage(openMsg,
ret = vmbus_post_msg(openMsg,
sizeof(struct vmbus_channel_open_channel));
if (ret != 0) {
DPRINT_ERR(VMBUS, "unable to open channel - %d", ret);
Expand Down Expand Up @@ -532,7 +532,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
DPRINT_DBG(VMBUS, "Sending GPADL Header - len %zd",
msginfo->msgsize - sizeof(*msginfo));

ret = VmbusPostMessage(gpadlmsg, msginfo->msgsize -
ret = vmbus_post_msg(gpadlmsg, msginfo->msgsize -
sizeof(*msginfo));
if (ret != 0) {
DPRINT_ERR(VMBUS, "Unable to open channel - %d", ret);
Expand All @@ -557,7 +557,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,

dump_gpadl_body(gpadl_body, submsginfo->msgsize -
sizeof(*submsginfo));
ret = VmbusPostMessage(gpadl_body,
ret = vmbus_post_msg(gpadl_body,
submsginfo->msgsize -
sizeof(*submsginfo));
if (ret != 0)
Expand Down Expand Up @@ -621,7 +621,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
&vmbus_connection.ChannelMsgList);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);

ret = VmbusPostMessage(msg,
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_gpadl_teardown));
if (ret != 0) {
/* TODO: */
Expand Down Expand Up @@ -669,7 +669,7 @@ void vmbus_close(struct vmbus_channel *channel)
msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
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) {
/* TODO: */
/* something... */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/hv/channel_mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr)
struct vmbus_channel *channel;

rescind = (struct vmbus_channel_rescind_offer *)hdr;
channel = GetChannelFromRelId(rescind->child_relid);
channel = relid2channel(rescind->child_relid);
if (channel == NULL) {
DPRINT_DBG(VMBUS, "channel not found for relId %d",
rescind->child_relid);
Expand Down Expand Up @@ -820,7 +820,7 @@ int vmbus_request_offers(void)
&msgInfo->msgListEntry);
SpinlockRelease(gVmbusConnection.channelMsgLock);*/

ret = VmbusPostMessage(msg,
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header));
if (ret != 0) {
DPRINT_ERR(VMBUS, "Unable to request offers - %d", ret);
Expand Down
39 changes: 21 additions & 18 deletions drivers/staging/hv/connection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
struct vmbus_channel_msginfo *msginfo = NULL;
Expand Down Expand Up @@ -126,7 +126,7 @@ int VmbusConnect(void)
msg->interrupt_page, msg->monitor_page1, msg->monitor_page2);

DPRINT_DBG(VMBUS, "Sending channel initiate msg...");
ret = VmbusPostMessage(msg,
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_initiate_contact));
if (ret != 0) {
list_del(&msginfo->msglistentry);
Expand Down Expand Up @@ -180,9 +180,10 @@ int VmbusConnect(void)
}

/*
* 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;
struct vmbus_channel_message_header *msg;
Expand All @@ -197,7 +198,7 @@ int VmbusDisconnect(void)

msg->msgtype = CHANNELMSG_UNLOAD;

ret = VmbusPostMessage(msg,
ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header));
if (ret != 0)
goto Cleanup;
Expand All @@ -217,9 +218,10 @@ int VmbusDisconnect(void)
}

/*
* 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 *found_channel = NULL;
Expand All @@ -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;
u32 relid = (u32)(unsigned long)context;
Expand All @@ -251,7 +253,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 = relid2channel(relid);

if (channel) {
vmbus_onchannel_event(channel);
Expand All @@ -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 maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
Expand All @@ -294,7 +296,8 @@ void VmbusOnEvents(void)
} else {
/* QueueWorkItem(VmbusProcessEvent, (void*)relid); */
/* ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid); */
VmbusProcessChannelEvent((void *)(unsigned long)relid);
process_chn_event((void *)
(unsigned long)relid);
}
}
}
Expand All @@ -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;

Expand All @@ -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 */
set_bit(child_relid & 31,
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/hv/vmbus_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
on_each_cpu(hv_synic_init, (void *)irqvector, 1);

/* Connect to VMBus in the root partition */
ret = VmbusConnect();
ret = vmbus_connect();

/* VmbusSendEvent(device->localPortId+1); */
return ret;
Expand All @@ -188,7 +188,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
int ret = 0;

vmbus_release_unattached_channels();
VmbusDisconnect();
vmbus_disconnect();
on_each_cpu(hv_synic_cleanup, NULL, 1);
return ret;
}
Expand Down Expand Up @@ -1045,7 +1045,7 @@ static void vmbus_msg_dpc(unsigned long data)
static void vmbus_event_dpc(unsigned long data)
{
/* Call to bus driver to handle interrupt */
VmbusOnEvents();
vmbus_on_event();
}

static irqreturn_t vmbus_isr(int irq, void *dev_id)
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/hv/vmbus_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,20 +115,20 @@ void vmbus_child_device_unregister(struct hv_device *device_obj);
/* VmbusChildDeviceDestroy( */
/* struct hv_device *); */

struct vmbus_channel *GetChannelFromRelId(u32 relId);
struct vmbus_channel *relid2channel(u32 relid);


/* 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_ */

0 comments on commit c697767

Please sign in to comment.