dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

staging: hv: Convert camel cased functions in hv.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>
This commit is contained in:
Haiyang Zhang 2010-11-08 14:04:42 -08:00 committed by Greg Kroah-Hartman
parent b8dfb264f4
commit d44890c8d2
5 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ int VmbusPostMessage(void *buffer, size_t bufferLen)
connId.asu32 = 0; connId.asu32 = 0;
connId.u.id = VMBUS_MESSAGE_CONNECTION_ID; connId.u.id = VMBUS_MESSAGE_CONNECTION_ID;
return HvPostMessage(connId, 1, buffer, bufferLen); return hv_post_message(connId, 1, buffer, bufferLen);
} }
/* /*
@ -324,5 +324,5 @@ int VmbusSetEvent(u32 childRelId)
(unsigned long *)gVmbusConnection.SendInterruptPage + (unsigned long *)gVmbusConnection.SendInterruptPage +
(childRelId >> 5)); (childRelId >> 5));
return HvSignalEvent(); return hv_signal_event();
} }

47
drivers/staging/hv/hv.c
View File

@ -36,9 +36,10 @@ struct hv_context hv_context = {
}; };
/* /*
* HvQueryHypervisorPresence - Query the cpuid for presense of windows hypervisor * query_hypervisor_presence
* - Query the cpuid for presense of windows hypervisor
*/ */
static int HvQueryHypervisorPresence(void) static int query_hypervisor_presence(void)
{ {
unsigned int eax; unsigned int eax;
unsigned int ebx; unsigned int ebx;
@ -57,9 +58,9 @@ static int HvQueryHypervisorPresence(void)
} }
/* /*
* HvQueryHypervisorInfo - Get version info of the windows hypervisor * query_hypervisor_info - Get version info of the windows hypervisor
*/ */
static int HvQueryHypervisorInfo(void) static int query_hypervisor_info(void)
{ {
unsigned int eax; unsigned int eax;
unsigned int ebx; unsigned int ebx;
@ -126,9 +127,9 @@ static int HvQueryHypervisorInfo(void)
} }
/* /*
* HvDoHypercall - Invoke the specified hypercall * do_hypercall- Invoke the specified hypercall
*/ */
static u64 HvDoHypercall(u64 control, void *input, void *output) static u64 do_hypercall(u64 control, void *input, void *output)
{ {
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
u64 hv_status = 0; u64 hv_status = 0;
@ -181,11 +182,11 @@ static u64 HvDoHypercall(u64 control, void *input, void *output)
} }
/* /*
* HvInit - Main initialization routine. * hv_init - Main initialization routine.
* *
* This routine must be called before any other routines in here are called * This routine must be called before any other routines in here are called
*/ */
int HvInit(void) int hv_init(void)
{ {
int ret = 0; int ret = 0;
int max_leaf; int max_leaf;
@ -196,7 +197,7 @@ int HvInit(void)
memset(hv_context.synic_message_page, 0, memset(hv_context.synic_message_page, 0,
sizeof(void *) * MAX_NUM_CPUS); sizeof(void *) * MAX_NUM_CPUS);
if (!HvQueryHypervisorPresence()) { if (!query_hypervisor_presence()) {
DPRINT_ERR(VMBUS, "No Windows hypervisor detected!!"); DPRINT_ERR(VMBUS, "No Windows hypervisor detected!!");
goto Cleanup; goto Cleanup;
} }
@ -204,7 +205,7 @@ int HvInit(void)
DPRINT_INFO(VMBUS, DPRINT_INFO(VMBUS,
"Windows hypervisor detected! Retrieving more info..."); "Windows hypervisor detected! Retrieving more info...");
max_leaf = HvQueryHypervisorInfo(); max_leaf = query_hypervisor_info();
/* HvQueryHypervisorFeatures(maxLeaf); */ /* HvQueryHypervisorFeatures(maxLeaf); */
/* /*
@ -291,11 +292,11 @@ Cleanup:
} }
/* /*
* HvCleanup - Cleanup routine. * hv_cleanup - Cleanup routine.
* *
* This routine is called normally during driver unloading or exiting. * This routine is called normally during driver unloading or exiting.
*/ */
void HvCleanup(void) void hv_cleanup(void)
{ {
union hv_x64_msr_hypercall_contents hypercall_msr; union hv_x64_msr_hypercall_contents hypercall_msr;
@ -312,11 +313,11 @@ void HvCleanup(void)
} }
/* /*
* HvPostMessage - Post a message using the hypervisor message IPC. * hv_post_message - Post a message using the hypervisor message IPC.
* *
* This involves a hypercall. * This involves a hypercall.
*/ */
u16 HvPostMessage(union hv_connection_id connection_id, u16 hv_post_message(union hv_connection_id connection_id,
enum hv_message_type message_type, enum hv_message_type message_type,
void *payload, size_t payload_size) void *payload, size_t payload_size)
{ {
@ -344,7 +345,8 @@ u16 HvPostMessage(union hv_connection_id connection_id,
aligned_msg->payload_size = payload_size; aligned_msg->payload_size = payload_size;
memcpy((void *)aligned_msg->payload, payload, payload_size); memcpy((void *)aligned_msg->payload, payload, payload_size);
status = HvDoHypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL) & 0xFFFF; status = do_hypercall(HVCALL_POST_MESSAGE, aligned_msg, NULL)
& 0xFFFF;
kfree((void *)addr); kfree((void *)addr);
@ -353,28 +355,29 @@ u16 HvPostMessage(union hv_connection_id connection_id,
/* /*
* HvSignalEvent - Signal an event on the specified connection using the hypervisor event IPC. * hv_signal_event -
* Signal an event on the specified connection using the hypervisor event IPC.
* *
* This involves a hypercall. * This involves a hypercall.
*/ */
u16 HvSignalEvent(void) u16 hv_signal_event(void)
{ {
u16 status; u16 status;
status = HvDoHypercall(HVCALL_SIGNAL_EVENT, status = do_hypercall(HVCALL_SIGNAL_EVENT,
hv_context.signal_event_param, hv_context.signal_event_param,
NULL) & 0xFFFF; NULL) & 0xFFFF;
return status; return status;
} }
/* /*
* HvSynicInit - Initialize the Synthethic Interrupt Controller. * hv_synic_init - Initialize the Synthethic Interrupt Controller.
* *
* If it is already initialized by another entity (ie x2v shim), we need to * If it is already initialized by another entity (ie x2v shim), we need to
* retrieve the initialized message and event pages. Otherwise, we create and * retrieve the initialized message and event pages. Otherwise, we create and
* initialize the message and event pages. * initialize the message and event pages.
*/ */
void HvSynicInit(void *irqarg) void hv_synic_init(void *irqarg)
{ {
u64 version; u64 version;
union hv_synic_simp simp; union hv_synic_simp simp;
@ -467,9 +470,9 @@ Cleanup:
} }
/* /*
* HvSynicCleanup - Cleanup routine for HvSynicInit(). * hv_synic_cleanup - Cleanup routine for hv_synic_init().
*/ */
void HvSynicCleanup(void *arg) void hv_synic_cleanup(void *arg)
{ {
union hv_synic_sint shared_sint; union hv_synic_sint shared_sint;
union hv_synic_simp simp; union hv_synic_simp simp;

16
drivers/staging/hv/hv.h
View File

@ -123,18 +123,18 @@ extern struct hv_context hv_context;
/* Hv Interface */ /* Hv Interface */
extern int HvInit(void); extern int hv_init(void);
extern void HvCleanup(void); extern void hv_cleanup(void);
extern u16 HvPostMessage(union hv_connection_id connectionId, extern u16 hv_post_message(union hv_connection_id connection_id,
enum hv_message_type messageType, enum hv_message_type message_type,
void *payload, size_t payloadSize); void *payload, size_t payload_size);
extern u16 HvSignalEvent(void); extern u16 hv_signal_event(void);
extern void HvSynicInit(void *irqarg); extern void hv_synic_init(void *irqarg);
extern void HvSynicCleanup(void *arg); extern void hv_synic_cleanup(void *arg);
#endif /* __HV_H__ */ #endif /* __HV_H__ */

4
drivers/staging/hv/hv_api.h
View File

@ -836,7 +836,7 @@ enum hv_call_code {
HVCALL_SIGNAL_EVENT = 0x005d, HVCALL_SIGNAL_EVENT = 0x005d,
}; };
/* Definition of the HvPostMessage hypercall input structure. */ /* Definition of the hv_post_message hypercall input structure. */
struct hv_input_post_message { struct hv_input_post_message {
union hv_connection_id connectionid; union hv_connection_id connectionid;
u32 reserved; u32 reserved;
@ -845,7 +845,7 @@ struct hv_input_post_message {
u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
}; };
/* Definition of the HvSignalEvent hypercall input structure. */ /* Definition of the hv_signal_event hypercall input structure. */
struct hv_input_signal_event { struct hv_input_signal_event {
union hv_connection_id connectionid; union hv_connection_id connectionid;
u16 flag_number; u16 flag_number;

8
drivers/staging/hv/vmbus.c
View File

@ -109,7 +109,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)
/* strcpy(dev->name, "vmbus"); */ /* strcpy(dev->name, "vmbus"); */
/* SynIC setup... */ /* SynIC setup... */
on_each_cpu(HvSynicInit, (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 = VmbusConnect();
@ -127,7 +127,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
vmbus_release_unattached_channels(); vmbus_release_unattached_channels();
VmbusDisconnect(); VmbusDisconnect();
on_each_cpu(HvSynicCleanup, NULL, 1); on_each_cpu(hv_synic_cleanup, NULL, 1);
return ret; return ret;
} }
@ -138,7 +138,7 @@ static void VmbusOnCleanup(struct hv_driver *drv)
{ {
/* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */ /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */
HvCleanup(); hv_cleanup();
} }
/* /*
@ -264,7 +264,7 @@ int VmbusInitialize(struct hv_driver *drv)
driver->GetChannelOffers = VmbusGetChannelOffers; driver->GetChannelOffers = VmbusGetChannelOffers;
/* Hypervisor initialization...setup hypercall page..etc */ /* Hypervisor initialization...setup hypercall page..etc */
ret = HvInit(); ret = hv_init();
if (ret != 0) if (ret != 0)
DPRINT_ERR(VMBUS, "Unable to initialize the hypervisor - 0x%x", DPRINT_ERR(VMBUS, "Unable to initialize the hypervisor - 0x%x",
ret); ret);