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

Commit 2acadc26 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: remove DPRINT_ENTER macro 



We have ftrace to look at function traces if its really
needed.  Don't roll custom macros for this.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 94daa643

drivers/staging/hv/blkvsc.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -40,8 +40,6 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) 
	struct storvsc_device_info *deviceInfo;

	struct storvsc_device_info *deviceInfo;

	int ret = 0;

	int ret = 0;





	DPRINT_ENTER(BLKVSC);



	deviceInfo = (struct storvsc_device_info *)AdditionalInfo;

	deviceInfo = (struct storvsc_device_info *)AdditionalInfo;





	ret = StorVscOnDeviceAdd(Device, AdditionalInfo);

	ret = StorVscOnDeviceAdd(Device, AdditionalInfo);
@@ -73,8 +71,6 @@ int BlkVscInitialize(struct hv_driver *Driver) 
	struct storvsc_driver_object *storDriver;

	struct storvsc_driver_object *storDriver;

	int ret = 0;

	int ret = 0;





	DPRINT_ENTER(BLKVSC);



	storDriver = (struct storvsc_driver_object *)Driver;

	storDriver = (struct storvsc_driver_object *)Driver;





	/* Make sure we are at least 2 pages since 1 page is used for control */

	/* Make sure we are at least 2 pages since 1 page is used for control */

drivers/staging/hv/blkvsc_drv.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -175,8 +175,6 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) 
	struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;

	struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;

	int ret;

	int ret;





	DPRINT_ENTER(BLKVSC_DRV);



	vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);

	vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);





	storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;

	storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
@@ -214,8 +212,6 @@ static void blkvsc_drv_exit(void) 
	struct device *current_dev;

	struct device *current_dev;

	int ret;

	int ret;





	DPRINT_ENTER(BLKVSC_DRV);



	while (1) {

	while (1) {

		current_dev = NULL;

		current_dev = NULL;
@@ -268,8 +264,6 @@ static int blkvsc_probe(struct device *device) 
	static int ide0_registered;

	static int ide0_registered;

	static int ide1_registered;

	static int ide1_registered;





	DPRINT_ENTER(BLKVSC_DRV);



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");

	DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter");





	if (!storvsc_drv_obj->Base.OnDeviceAdd) {

	if (!storvsc_drv_obj->Base.OnDeviceAdd) {
@@ -751,8 +745,6 @@ static int blkvsc_remove(struct device *device) 
	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;





	DPRINT_ENTER(BLKVSC_DRV);



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");

	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");





	if (!storvsc_drv_obj->Base.OnDeviceRemove) {

	if (!storvsc_drv_obj->Base.OnDeviceRemove) {
@@ -1492,8 +1484,6 @@ static int __init blkvsc_init(void) 




	BUILD_BUG_ON(sizeof(sector_t) != 8);

	BUILD_BUG_ON(sizeof(sector_t) != 8);





	DPRINT_ENTER(BLKVSC_DRV);



	DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");

	DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");





	ret = blkvsc_drv_init(BlkVscInitialize);

	ret = blkvsc_drv_init(BlkVscInitialize);
@@ -1505,9 +1495,7 @@ static int __init blkvsc_init(void) 




static void __exit blkvsc_exit(void)

static void __exit blkvsc_exit(void)

{

{

	DPRINT_ENTER(BLKVSC_DRV);

	blkvsc_drv_exit();

	blkvsc_drv_exit();

	DPRINT_ENTER(BLKVSC_DRV);

}

}





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

drivers/staging/hv/channel.c

+0 −21
Original line number Original line Diff line number Diff line
@@ -74,8 +74,6 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel) 
{

{

	struct hv_monitor_page *monitorPage;

	struct hv_monitor_page *monitorPage;





	DPRINT_ENTER(VMBUS);



	if (Channel->OfferMsg.MonitorAllocated) {

	if (Channel->OfferMsg.MonitorAllocated) {

		/* Each u32 represents 32 channels */

		/* Each u32 represents 32 channels */

		set_bit(Channel->OfferMsg.ChildRelId & 31,

		set_bit(Channel->OfferMsg.ChildRelId & 31,
@@ -101,8 +99,6 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 
{

{

	struct hv_monitor_page *monitorPage;

	struct hv_monitor_page *monitorPage;





	DPRINT_ENTER(VMBUS);



	if (Channel->OfferMsg.MonitorAllocated) {

	if (Channel->OfferMsg.MonitorAllocated) {

		/* Each u32 represents 32 channels */

		/* Each u32 represents 32 channels */

		clear_bit(Channel->OfferMsg.ChildRelId & 31,

		clear_bit(Channel->OfferMsg.ChildRelId & 31,
@@ -180,8 +176,6 @@ int VmbusChannelOpen(struct vmbus_channel *NewChannel, u32 SendRingBufferSize, 
	unsigned long flags;

	unsigned long flags;

	int ret, err = 0;

	int ret, err = 0;





	DPRINT_ENTER(VMBUS);



	/* Aligned to page size */

	/* Aligned to page size */

	/* ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1))); */

	/* ASSERT(!(SendRingBufferSize & (PAGE_SIZE - 1))); */

	/* ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1))); */

	/* ASSERT(!(RecvRingBufferSize & (PAGE_SIZE - 1))); */
@@ -511,8 +505,6 @@ int VmbusChannelEstablishGpadl(struct vmbus_channel *Channel, void *Kbuffer, 
	unsigned long flags;

	unsigned long flags;

	int ret = 0;

	int ret = 0;





	DPRINT_ENTER(VMBUS);



	nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);

	nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);

	atomic_inc(&gVmbusConnection.NextGpadlHandle);

	atomic_inc(&gVmbusConnection.NextGpadlHandle);
@@ -610,8 +602,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle) 
	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;





	DPRINT_ENTER(VMBUS);



	/* ASSERT(GpadlHandle != 0); */

	/* ASSERT(GpadlHandle != 0); */





	info = kmalloc(sizeof(*info) +

	info = kmalloc(sizeof(*info) +
@@ -668,8 +658,6 @@ void VmbusChannelClose(struct vmbus_channel *Channel) 
	unsigned long flags;

	unsigned long flags;

	int ret;

	int ret;





	DPRINT_ENTER(VMBUS);



	/* Stop callback and cancel the timer asap */

	/* Stop callback and cancel the timer asap */

	Channel->OnChannelCallback = NULL;

	Channel->OnChannelCallback = NULL;

	del_timer_sync(&Channel->poll_timer);

	del_timer_sync(&Channel->poll_timer);
@@ -751,7 +739,6 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, const void *Buffer, 
	u64 alignedData = 0;

	u64 alignedData = 0;

	int ret;

	int ret;





	DPRINT_ENTER(VMBUS);

	DPRINT_DBG(VMBUS, "channel %p buffer %p len %d",

	DPRINT_DBG(VMBUS, "channel %p buffer %p len %d",

		   Channel, Buffer, BufferLen);

		   Channel, Buffer, BufferLen);
@@ -802,8 +789,6 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel, 
	struct scatterlist bufferList[3];

	struct scatterlist bufferList[3];

	u64 alignedData = 0;

	u64 alignedData = 0;





	DPRINT_ENTER(VMBUS);



	if (PageCount > MAX_PAGE_BUFFER_COUNT)

	if (PageCount > MAX_PAGE_BUFFER_COUNT)

		return -EINVAL;

		return -EINVAL;
@@ -869,8 +854,6 @@ int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel, 
	u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset,

	u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset,

					 MultiPageBuffer->Length);

					 MultiPageBuffer->Length);





	DPRINT_ENTER(VMBUS);



	DumpVmbusChannel(Channel);

	DumpVmbusChannel(Channel);





	DPRINT_DBG(VMBUS, "data buffer - offset %u len %u pfn count %u",

	DPRINT_DBG(VMBUS, "data buffer - offset %u len %u pfn count %u",
@@ -944,8 +927,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer, 
	int ret;

	int ret;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	*BufferActualLen = 0;

	*BufferActualLen = 0;

	*RequestId = 0;

	*RequestId = 0;
@@ -1011,8 +992,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer, 
	int ret;

	int ret;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	*BufferActualLen = 0;

	*BufferActualLen = 0;

	*RequestId = 0;

	*RequestId = 0;

drivers/staging/hv/channel_mgmt.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -266,8 +266,6 @@ static inline void ReleaseVmbusChannel(void *context) 
{

{

	struct vmbus_channel *channel = context;

	struct vmbus_channel *channel = context;





	DPRINT_ENTER(VMBUS);



	DPRINT_DBG(VMBUS, "releasing channel (%p)", channel);

	DPRINT_DBG(VMBUS, "releasing channel (%p)", channel);

	destroy_workqueue(channel->ControlWQ);

	destroy_workqueue(channel->ControlWQ);

	DPRINT_DBG(VMBUS, "channel released (%p)", channel);

	DPRINT_DBG(VMBUS, "channel released (%p)", channel);
@@ -306,8 +304,6 @@ static void VmbusChannelProcessOffer(void *context) 
	int cnt;

	int cnt;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	/* Make sure this is a new offer */

	/* Make sure this is a new offer */

	spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);

	spin_lock_irqsave(&gVmbusConnection.channel_lock, flags);
@@ -401,7 +397,6 @@ static void VmbusChannelProcessRescindOffer(void *context) 
{

{

	struct vmbus_channel *channel = context;

	struct vmbus_channel *channel = context;





	DPRINT_ENTER(VMBUS);

	VmbusChildDeviceRemove(channel->DeviceObject);

	VmbusChildDeviceRemove(channel->DeviceObject);

	DPRINT_EXIT(VMBUS);

	DPRINT_EXIT(VMBUS);

}

}
@@ -422,8 +417,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr) 
	int i;

	int i;

	int fSupported = 0;

	int fSupported = 0;





	DPRINT_ENTER(VMBUS);



	offer = (struct vmbus_channel_offer_channel *)hdr;

	offer = (struct vmbus_channel_offer_channel *)hdr;

	for (i = 0; i < MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) {

	for (i = 0; i < MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) {

		if (memcmp(&offer->Offer.InterfaceType,

		if (memcmp(&offer->Offer.InterfaceType,
@@ -499,8 +492,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr) 
	struct vmbus_channel_rescind_offer *rescind;

	struct vmbus_channel_rescind_offer *rescind;

	struct vmbus_channel *channel;

	struct vmbus_channel *channel;





	DPRINT_ENTER(VMBUS);



	rescind = (struct vmbus_channel_rescind_offer *)hdr;

	rescind = (struct vmbus_channel_rescind_offer *)hdr;

	channel = GetChannelFromRelId(rescind->ChildRelId);

	channel = GetChannelFromRelId(rescind->ChildRelId);

	if (channel == NULL) {

	if (channel == NULL) {
@@ -524,7 +515,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr) 
static void VmbusChannelOnOffersDelivered(

static void VmbusChannelOnOffersDelivered(

			struct vmbus_channel_message_header *hdr)

			struct vmbus_channel_message_header *hdr)

{

{

	DPRINT_ENTER(VMBUS);

	DPRINT_EXIT(VMBUS);

	DPRINT_EXIT(VMBUS);

}

}
@@ -544,8 +534,6 @@ static void VmbusChannelOnOpenResult(struct vmbus_channel_message_header *hdr) 
	struct vmbus_channel_open_channel *openMsg;

	struct vmbus_channel_open_channel *openMsg;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	result = (struct vmbus_channel_open_result *)hdr;

	result = (struct vmbus_channel_open_result *)hdr;

	DPRINT_DBG(VMBUS, "vmbus open result - %d", result->Status);

	DPRINT_DBG(VMBUS, "vmbus open result - %d", result->Status);
@@ -592,8 +580,6 @@ static void VmbusChannelOnGpadlCreated(struct vmbus_channel_message_header *hdr) 
	struct vmbus_channel_gpadl_header *gpadlHeader;

	struct vmbus_channel_gpadl_header *gpadlHeader;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	gpadlCreated = (struct vmbus_channel_gpadl_created *)hdr;

	gpadlCreated = (struct vmbus_channel_gpadl_created *)hdr;

	DPRINT_DBG(VMBUS, "vmbus gpadl created result - %d",

	DPRINT_DBG(VMBUS, "vmbus gpadl created result - %d",

		   gpadlCreated->CreationStatus);

		   gpadlCreated->CreationStatus);
@@ -645,8 +631,6 @@ static void VmbusChannelOnGpadlTorndown( 
	struct vmbus_channel_gpadl_teardown *gpadlTeardown;

	struct vmbus_channel_gpadl_teardown *gpadlTeardown;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	gpadlTorndown = (struct vmbus_channel_gpadl_torndown *)hdr;

	gpadlTorndown = (struct vmbus_channel_gpadl_torndown *)hdr;





	/*

	/*
@@ -693,8 +677,6 @@ static void VmbusChannelOnVersionResponse( 
	struct vmbus_channel_version_response *versionResponse;

	struct vmbus_channel_version_response *versionResponse;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	versionResponse = (struct vmbus_channel_version_response *)hdr;

	versionResponse = (struct vmbus_channel_version_response *)hdr;

	spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);

	spin_lock_irqsave(&gVmbusConnection.channelmsg_lock, flags);
@@ -750,8 +732,6 @@ void VmbusOnChannelMessage(void *Context) 
	struct vmbus_channel_message_header *hdr;

	struct vmbus_channel_message_header *hdr;

	int size;

	int size;





	DPRINT_ENTER(VMBUS);



	hdr = (struct vmbus_channel_message_header *)msg->u.Payload;

	hdr = (struct vmbus_channel_message_header *)msg->u.Payload;

	size = msg->Header.PayloadSize;

	size = msg->Header.PayloadSize;
@@ -787,8 +767,6 @@ int VmbusChannelRequestOffers(void) 
	struct vmbus_channel_msginfo *msgInfo;

	struct vmbus_channel_msginfo *msgInfo;

	int ret;

	int ret;





	DPRINT_ENTER(VMBUS);



	msgInfo = kmalloc(sizeof(*msgInfo) +

	msgInfo = kmalloc(sizeof(*msgInfo) +

			  sizeof(struct vmbus_channel_message_header),

			  sizeof(struct vmbus_channel_message_header),

			  GFP_KERNEL);

			  GFP_KERNEL);

drivers/staging/hv/connection.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -44,8 +44,6 @@ int VmbusConnect(void) 
	struct vmbus_channel_initiate_contact *msg;

	struct vmbus_channel_initiate_contact *msg;

	unsigned long flags;

	unsigned long flags;





	DPRINT_ENTER(VMBUS);



	/* Make sure we are not connecting or connected */

	/* Make sure we are not connecting or connected */

	if (gVmbusConnection.ConnectState != Disconnected)

	if (gVmbusConnection.ConnectState != Disconnected)

		return -1;

		return -1;
@@ -193,8 +191,6 @@ int VmbusDisconnect(void) 
	int ret = 0;

	int ret = 0;

	struct vmbus_channel_message_header *msg;

	struct vmbus_channel_message_header *msg;





	DPRINT_ENTER(VMBUS);



	/* Make sure we are connected */

	/* Make sure we are connected */

	if (gVmbusConnection.ConnectState != Connected)

	if (gVmbusConnection.ConnectState != Connected)

		return -1;

		return -1;
@@ -285,8 +281,6 @@ void VmbusOnEvents(void) 
	int relid;

	int relid;

	u32 *recvInterruptPage = gVmbusConnection.RecvInterruptPage;

	u32 *recvInterruptPage = gVmbusConnection.RecvInterruptPage;





	DPRINT_ENTER(VMBUS);



	/* Check events */

	/* Check events */

	if (recvInterruptPage) {

	if (recvInterruptPage) {

		for (dword = 0; dword < maxdword; dword++) {

		for (dword = 0; dword < maxdword; dword++) {
@@ -334,8 +328,6 @@ int VmbusSetEvent(u32 childRelId) 
{

{

	int ret = 0;

	int ret = 0;





	DPRINT_ENTER(VMBUS);



	/* Each u32 represents 32 channels */

	/* Each u32 represents 32 channels */

	set_bit(childRelId & 31,

	set_bit(childRelId & 31,

		(unsigned long *)gVmbusConnection.SendInterruptPage +

		(unsigned long *)gVmbusConnection.SendInterruptPage +