Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203df82d authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d39f1286

drivers/staging/hv/channel.c

+10 −10
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 
	newchannel->channel_callback_context = context;



	/* Allocate the ring buffer */

	out = osd_PageAlloc((send_ringbuffer_size + recv_ringbuffer_size)

	out = osd_page_alloc((send_ringbuffer_size + recv_ringbuffer_size)

			     >> PAGE_SHIFT);

	if (!out)

		return -ENOMEM;
@@ -242,7 +242,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 
		goto errorout;

	}



	openInfo->waitevent = osd_WaitEventCreate();

	openInfo->waitevent = osd_waitevent_create();

	if (!openInfo->waitevent) {

		err = -ENOMEM;

		goto errorout;
@@ -280,7 +280,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 
	}



	/* FIXME: Need to time-out here */

	osd_WaitEventWait(openInfo->waitevent);

	osd_waitevent_wait(openInfo->waitevent);



	if (openInfo->response.open_result.status == 0)

		DPRINT_INFO(VMBUS, "channel <%p> open success!!", newchannel);
@@ -300,7 +300,7 @@ Cleanup: 
errorout:

	RingBufferCleanup(&newchannel->outbound);

	RingBufferCleanup(&newchannel->inbound);

	osd_PageFree(out, (send_ringbuffer_size + recv_ringbuffer_size)

	osd_page_free(out, (send_ringbuffer_size + recv_ringbuffer_size)

		     >> PAGE_SHIFT);

	kfree(openInfo);

	return err;
@@ -508,7 +508,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, 
	if (ret)

		return ret;



	msginfo->waitevent = osd_WaitEventCreate();

	msginfo->waitevent = osd_waitevent_create();

	if (!msginfo->waitevent) {

		ret = -ENOMEM;

		goto Cleanup;
@@ -565,7 +565,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, 


		}

	}

	osd_WaitEventWait(msginfo->waitevent);

	osd_waitevent_wait(msginfo->waitevent);



	/* At this point, we received the gpadl created msg */

	DPRINT_DBG(VMBUS, "Received GPADL created "
@@ -604,7 +604,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) 
	if (!info)

		return -ENOMEM;



	info->waitevent = osd_WaitEventCreate();

	info->waitevent = osd_waitevent_create();

	if (!info->waitevent) {

		kfree(info);

		return -ENOMEM;
@@ -628,7 +628,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) 
		/* something... */

	}



	osd_WaitEventWait(info->waitevent);

	osd_waitevent_wait(info->waitevent);



	/* Received a torndown response */

	spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
@@ -663,7 +663,7 @@ void vmbus_close(struct vmbus_channel *channel) 
	if (!info)

		return;



	/* info->waitEvent = osd_WaitEventCreate(); */

	/* info->waitEvent = osd_waitevent_create(); */



	msg = (struct vmbus_channel_close_channel *)info->msg;

	msg->header.msgtype = CHANNELMSG_CLOSECHANNEL;
@@ -686,7 +686,7 @@ void vmbus_close(struct vmbus_channel *channel) 
	RingBufferCleanup(&channel->outbound);

	RingBufferCleanup(&channel->inbound);



	osd_PageFree(channel->ringbuffer_pages, channel->ringbuffer_pagecount);

	osd_page_free(channel->ringbuffer_pages, channel->ringbuffer_pagecount);



	kfree(info);

drivers/staging/hv/channel_mgmt.c

+6 −6
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr) 
				memcpy(&msginfo->response.open_result,

				       result,

				       sizeof(struct vmbus_channel_open_result));

				osd_WaitEventSet(msginfo->waitevent);

				osd_waitevent_set(msginfo->waitevent);

				break;

			}

		}
@@ -616,7 +616,7 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr) 
				memcpy(&msginfo->response.gpadl_created,

				       gpadlcreated,

				       sizeof(struct vmbus_channel_gpadl_created));

				osd_WaitEventSet(msginfo->waitevent);

				osd_waitevent_set(msginfo->waitevent);

				break;

			}

		}
@@ -662,7 +662,7 @@ static void vmbus_ongpadl_torndown( 
				memcpy(&msginfo->response.gpadl_torndown,

				       gpadl_torndown,

				       sizeof(struct vmbus_channel_gpadl_torndown));

				osd_WaitEventSet(msginfo->waitevent);

				osd_waitevent_set(msginfo->waitevent);

				break;

			}

		}
@@ -703,7 +703,7 @@ static void vmbus_onversion_response( 
			memcpy(&msginfo->response.version_response,

			      version_response,

			      sizeof(struct vmbus_channel_version_response));

			osd_WaitEventSet(msginfo->waitevent);

			osd_waitevent_set(msginfo->waitevent);

		}

	}

	spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);
@@ -782,7 +782,7 @@ int vmbus_request_offers(void) 
	if (!msginfo)

		return -ENOMEM;



	msginfo->waitevent = osd_WaitEventCreate();

	msginfo->waitevent = osd_waitevent_create();

	if (!msginfo->waitevent) {

		kfree(msginfo);

		return -ENOMEM;
@@ -808,7 +808,7 @@ int vmbus_request_offers(void) 


		goto Cleanup;

	}

	/* osd_WaitEventWait(msgInfo->waitEvent); */

	/* osd_waitevent_wait(msgInfo->waitEvent); */



	/*SpinlockAcquire(gVmbusConnection.channelMsgLock);

	REMOVE_ENTRY_LIST(&msgInfo->msgListEntry);

drivers/staging/hv/connection.c

+7 −7
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int VmbusConnect(void) 
	 * Setup the vmbus event connection for channel interrupt

	 * abstraction stuff

	 */

	gVmbusConnection.InterruptPage = osd_PageAlloc(1);

	gVmbusConnection.InterruptPage = osd_page_alloc(1);

	if (gVmbusConnection.InterruptPage == NULL) {

		ret = -1;

		goto Cleanup;
@@ -81,7 +81,7 @@ int VmbusConnect(void) 
	 * Setup the monitor notification facility. The 1st page for

	 * parent->child and the 2nd page for child->parent

	 */

	gVmbusConnection.MonitorPages = osd_PageAlloc(2);

	gVmbusConnection.MonitorPages = osd_page_alloc(2);

	if (gVmbusConnection.MonitorPages == NULL) {

		ret = -1;

		goto Cleanup;
@@ -95,7 +95,7 @@ int VmbusConnect(void) 
		goto Cleanup;

	}



	msgInfo->waitevent = osd_WaitEventCreate();

	msgInfo->waitevent = osd_waitevent_create();

	if (!msgInfo->waitevent) {

		ret = -ENOMEM;

		goto Cleanup;
@@ -134,7 +134,7 @@ int VmbusConnect(void) 
	}



	/* Wait for the connection response */

	osd_WaitEventWait(msgInfo->waitevent);

	osd_waitevent_wait(msgInfo->waitevent);



	list_del(&msgInfo->msglistentry);
@@ -162,12 +162,12 @@ Cleanup: 
		destroy_workqueue(gVmbusConnection.WorkQueue);



	if (gVmbusConnection.InterruptPage) {

		osd_PageFree(gVmbusConnection.InterruptPage, 1);

		osd_page_free(gVmbusConnection.InterruptPage, 1);

		gVmbusConnection.InterruptPage = NULL;

	}



	if (gVmbusConnection.MonitorPages) {

		osd_PageFree(gVmbusConnection.MonitorPages, 2);

		osd_page_free(gVmbusConnection.MonitorPages, 2);

		gVmbusConnection.MonitorPages = NULL;

	}
@@ -202,7 +202,7 @@ int VmbusDisconnect(void) 
	if (ret != 0)

		goto Cleanup;



	osd_PageFree(gVmbusConnection.InterruptPage, 1);

	osd_page_free(gVmbusConnection.InterruptPage, 1);



	/* TODO: iterate thru the msg list and free up */

	destroy_workqueue(gVmbusConnection.WorkQueue);

drivers/staging/hv/hv.c

+6 −6
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ int hv_init(void) 


	/*

	* Allocate the hypercall page memory

	* virtaddr = osd_PageAlloc(1);

	* virtaddr = osd_page_alloc(1);

	*/

	virtaddr = osd_VirtualAllocExec(PAGE_SIZE);

	virtaddr = osd_virtual_alloc_exec(PAGE_SIZE);



	if (!virtaddr) {

		DPRINT_ERR(VMBUS,
@@ -462,10 +462,10 @@ void hv_synic_init(void *irqarg) 


Cleanup:

	if (hv_context.synic_event_page[cpu])

		osd_PageFree(hv_context.synic_event_page[cpu], 1);

		osd_page_free(hv_context.synic_event_page[cpu], 1);



	if (hv_context.synic_message_page[cpu])

		osd_PageFree(hv_context.synic_message_page[cpu], 1);

		osd_page_free(hv_context.synic_message_page[cpu], 1);

	return;

}
@@ -502,6 +502,6 @@ void hv_synic_cleanup(void *arg) 


	wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);



	osd_PageFree(hv_context.synic_message_page[cpu], 1);

	osd_PageFree(hv_context.synic_event_page[cpu], 1);

	osd_page_free(hv_context.synic_message_page[cpu], 1);

	osd_page_free(hv_context.synic_event_page[cpu], 1);

}

drivers/staging/hv/netvsc.c

+12 −12
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) 
	/* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */



	netDevice->ReceiveBuffer =

		osd_PageAlloc(netDevice->ReceiveBufferSize >> PAGE_SHIFT);

		osd_page_alloc(netDevice->ReceiveBufferSize >> PAGE_SHIFT);

	if (!netDevice->ReceiveBuffer) {

		DPRINT_ERR(NETVSC,

			   "unable to allocate receive buffer of size %d",
@@ -249,7 +249,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) 
		goto Cleanup;

	}



	/* osd_WaitEventWait(ext->ChannelInitEvent); */

	/* osd_waitevent_wait(ext->ChannelInitEvent); */



	/* Notify the NetVsp of the gpadl handle */

	DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendReceiveBuffer...");
@@ -274,7 +274,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) 
		goto Cleanup;

	}



	osd_WaitEventWait(netDevice->ChannelInitEvent);

	osd_waitevent_wait(netDevice->ChannelInitEvent);



	/* Check the response */

	if (initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status != NvspStatusSuccess) {
@@ -350,7 +350,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) 
	/* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */



	netDevice->SendBuffer =

		osd_PageAlloc(netDevice->SendBufferSize >> PAGE_SHIFT);

		osd_page_alloc(netDevice->SendBufferSize >> PAGE_SHIFT);

	if (!netDevice->SendBuffer) {

		DPRINT_ERR(NETVSC, "unable to allocate send buffer of size %d",

			   netDevice->SendBufferSize);
@@ -375,7 +375,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) 
		goto Cleanup;

	}



	/* osd_WaitEventWait(ext->ChannelInitEvent); */

	/* osd_waitevent_wait(ext->ChannelInitEvent); */



	/* Notify the NetVsp of the gpadl handle */

	DPRINT_INFO(NETVSC, "Sending NvspMessage1TypeSendSendBuffer...");
@@ -400,7 +400,7 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) 
		goto Cleanup;

	}



	osd_WaitEventWait(netDevice->ChannelInitEvent);

	osd_waitevent_wait(netDevice->ChannelInitEvent);



	/* Check the response */

	if (initPacket->Messages.Version1Messages.SendSendBufferComplete.Status != NvspStatusSuccess) {
@@ -480,7 +480,7 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) 
		DPRINT_INFO(NETVSC, "Freeing up receive buffer...");



		/* Free up the receive buffer */

		osd_PageFree(NetDevice->ReceiveBuffer,

		osd_page_free(NetDevice->ReceiveBuffer,

			     NetDevice->ReceiveBufferSize >> PAGE_SHIFT);

		NetDevice->ReceiveBuffer = NULL;

	}
@@ -553,7 +553,7 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) 
		DPRINT_INFO(NETVSC, "Freeing up send buffer...");



		/* Free up the receive buffer */

		osd_PageFree(NetDevice->SendBuffer,

		osd_page_free(NetDevice->SendBuffer,

			     NetDevice->SendBufferSize >> PAGE_SHIFT);

		NetDevice->SendBuffer = NULL;

	}
@@ -597,7 +597,7 @@ static int NetVscConnectToVsp(struct hv_device *Device) 
		goto Cleanup;

	}



	osd_WaitEventWait(netDevice->ChannelInitEvent);

	osd_waitevent_wait(netDevice->ChannelInitEvent);



	/* Now, check the response */

	/* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */
@@ -651,7 +651,7 @@ static int NetVscConnectToVsp(struct hv_device *Device) 
	 * packet) since our Vmbus always set the

	 * VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED flag

	 */

	 /* osd_WaitEventWait(NetVscChannel->ChannelInitEvent); */

	 /* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */



	/* Post the big receive buffer to NetVSP */

	ret = NetVscInitializeReceiveBufferWithNetVsp(Device);
@@ -710,7 +710,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) 
		list_add_tail(&packet->ListEntry,

			      &netDevice->ReceivePacketList);

	}

	netDevice->ChannelInitEvent = osd_WaitEventCreate();

	netDevice->ChannelInitEvent = osd_waitevent_create();

	if (!netDevice->ChannelInitEvent) {

		ret = -ENOMEM;

		goto Cleanup;
@@ -855,7 +855,7 @@ static void NetVscOnSendCompletion(struct hv_device *Device, 
		/* Copy the response back */

		memcpy(&netDevice->ChannelInitPacket, nvspPacket,

		       sizeof(struct nvsp_message));

		osd_WaitEventSet(netDevice->ChannelInitEvent);

		osd_waitevent_set(netDevice->ChannelInitEvent);

	} else if (nvspPacket->Header.MessageType ==

		   NvspMessage1TypeSendRNDISPacketComplete) {

		/* Get the send context */