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

Commit 83c720ea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: remove DPRINT_EXIT macro 



No need for it, use the built-in kernel function tracing instead
if you really need something like this.

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

drivers/staging/hv/blkvsc.c

+1 −7
Original line number Diff line number Diff line
@@ -43,10 +43,8 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) 
	deviceInfo = (struct storvsc_device_info *)AdditionalInfo;



	ret = StorVscOnDeviceAdd(Device, AdditionalInfo);

	if (ret != 0) {

		DPRINT_EXIT(BLKVSC);

	if (ret != 0)

		return ret;

	}



	/*

	 * We need to use the device instance guid to set the path and target
@@ -61,8 +59,6 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) 
	deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 |

			       Device->deviceInstance.data[4];



	DPRINT_EXIT(BLKVSC);



	return ret;

}
@@ -102,7 +98,5 @@ int BlkVscInitialize(struct hv_driver *Driver) 
	storDriver->Base.OnCleanup = StorVscOnCleanup;

	storDriver->OnIORequest	= StorVscOnIORequest;



	DPRINT_EXIT(BLKVSC);



	return ret;

}

drivers/staging/hv/blkvsc_drv.c

+1 −13
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) 
	/* The driver belongs to vmbus */

	ret = vmbus_child_driver_register(drv_ctx);



	DPRINT_EXIT(BLKVSC_DRV);



	return ret;

}
@@ -237,8 +235,6 @@ static void blkvsc_drv_exit(void) 


	vmbus_child_driver_unregister(drv_ctx);



	DPRINT_EXIT(BLKVSC_DRV);



	return;

}
@@ -407,8 +403,6 @@ Cleanup: 
		blkdev = NULL;

	}



	DPRINT_EXIT(BLKVSC_DRV);



	return ret;

}
@@ -747,10 +741,8 @@ static int blkvsc_remove(struct device *device) 


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



	if (!storvsc_drv_obj->Base.OnDeviceRemove) {

		DPRINT_EXIT(BLKVSC_DRV);

	if (!storvsc_drv_obj->Base.OnDeviceRemove)

		return -1;

	}



	/*

	 * Call to the vsc driver to let it know that the device is being
@@ -794,8 +786,6 @@ static int blkvsc_remove(struct device *device) 


	kfree(blkdev);



	DPRINT_EXIT(BLKVSC_DRV);



	return ret;

}
@@ -1488,8 +1478,6 @@ static int __init blkvsc_init(void) 


	ret = blkvsc_drv_init(BlkVscInitialize);



	DPRINT_EXIT(BLKVSC_DRV);



	return ret;

}

drivers/staging/hv/channel.c

+0 −31
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel) 
	} else {

		VmbusSetEvent(Channel->OfferMsg.ChildRelId);

	}



	DPRINT_EXIT(VMBUS);

}



#if 0
@@ -113,8 +111,6 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel) 
			  (unsigned long *)&monitorPage->TriggerGroup

					[Channel->MonitorGroup].Pending);

	}



	DPRINT_EXIT(VMBUS);

}



#endif
@@ -299,9 +295,6 @@ Cleanup: 


	kfree(openInfo->WaitEvent);

	kfree(openInfo);



	DPRINT_EXIT(VMBUS);



	return 0;



errorout:
@@ -586,9 +579,6 @@ Cleanup: 


	kfree(msgInfo->WaitEvent);

	kfree(msgInfo);



	DPRINT_EXIT(VMBUS);



	return ret;

}
@@ -642,9 +632,6 @@ int VmbusChannelTeardownGpadl(struct vmbus_channel *Channel, u32 GpadlHandle) 


	kfree(info->WaitEvent);

	kfree(info);



	DPRINT_EXIT(VMBUS);



	return ret;

}
@@ -710,8 +697,6 @@ void VmbusChannelClose(struct vmbus_channel *Channel) 


		FreeVmbusChannel(Channel);

	}



	DPRINT_EXIT(VMBUS);

}



/**
@@ -765,8 +750,6 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel, const void *Buffer, 
	if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))

		VmbusChannelSetEvent(Channel);



	DPRINT_EXIT(VMBUS);



	return ret;

}

EXPORT_SYMBOL(VmbusChannelSendPacket);
@@ -831,8 +814,6 @@ int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *Channel, 
	if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))

		VmbusChannelSetEvent(Channel);



	DPRINT_EXIT(VMBUS);



	return ret;

}
@@ -899,8 +880,6 @@ int VmbusChannelSendPacketMultiPageBuffer(struct vmbus_channel *Channel, 
	if (ret == 0 && !GetRingBufferInterruptMask(&Channel->Outbound))

		VmbusChannelSetEvent(Channel);



	DPRINT_EXIT(VMBUS);



	return ret;

}
@@ -938,7 +917,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer, 
		spin_unlock_irqrestore(&Channel->inbound_lock, flags);



		/* DPRINT_DBG(VMBUS, "nothing to read!!"); */

		DPRINT_EXIT(VMBUS);

		return 0;

	}
@@ -960,8 +938,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer, 


		DPRINT_ERR(VMBUS, "buffer too small - got %d needs %d",

			   BufferLen, userLen);

		DPRINT_EXIT(VMBUS);



		return -1;

	}
@@ -973,8 +949,6 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel, void *Buffer, 


	spin_unlock_irqrestore(&Channel->inbound_lock, flags);



	DPRINT_EXIT(VMBUS);



	return 0;

}

EXPORT_SYMBOL(VmbusChannelRecvPacket);
@@ -1003,7 +977,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer, 
		spin_unlock_irqrestore(&Channel->inbound_lock, flags);



		/* DPRINT_DBG(VMBUS, "nothing to read!!"); */

		DPRINT_EXIT(VMBUS);

		return 0;

	}
@@ -1024,7 +997,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer, 


		DPRINT_ERR(VMBUS, "buffer too small - needed %d bytes but "

			   "got space for only %d bytes", packetLen, BufferLen);

		DPRINT_EXIT(VMBUS);

		return -2;

	}
@@ -1034,9 +1006,6 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel, void *Buffer, 
	ret = RingBufferRead(&Channel->Inbound, Buffer, packetLen, 0);



	spin_unlock_irqrestore(&Channel->inbound_lock, flags);



	DPRINT_EXIT(VMBUS);



	return 0;

}

drivers/staging/hv/channel_mgmt.c

+0 −21
Original line number Diff line number Diff line
@@ -271,8 +271,6 @@ static inline void ReleaseVmbusChannel(void *context) 
	DPRINT_DBG(VMBUS, "channel released (%p)", channel);



	kfree(channel);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -329,7 +327,6 @@ static void VmbusChannelProcessOffer(void *context) 
		DPRINT_DBG(VMBUS, "Ignoring duplicate offer for relid (%d)",

			   newChannel->OfferMsg.ChildRelId);

		FreeVmbusChannel(newChannel);

		DPRINT_EXIT(VMBUS);

		return;

	}
@@ -387,7 +384,6 @@ static void VmbusChannelProcessOffer(void *context) 
			cnt++;

		}

	}

	DPRINT_EXIT(VMBUS);

}



/*
@@ -398,7 +394,6 @@ static void VmbusChannelProcessRescindOffer(void *context) 
	struct vmbus_channel *channel = context;



	VmbusChildDeviceRemove(channel->DeviceObject);

	DPRINT_EXIT(VMBUS);

}



/*
@@ -429,7 +424,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr) 
	if (!fSupported) {

		DPRINT_DBG(VMBUS, "Ignoring channel offer notification for "

			   "child relid %d", offer->ChildRelId);

		DPRINT_EXIT(VMBUS);

		return;

	}
@@ -478,8 +472,6 @@ static void VmbusChannelOnOffer(struct vmbus_channel_message_header *hdr) 
	/* TODO: Make sure the offer comes from our parent partition */

	osd_schedule_callback(newChannel->ControlWQ, VmbusChannelProcessOffer,

			      newChannel);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -503,8 +495,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr) 
	osd_schedule_callback(channel->ControlWQ,

			      VmbusChannelProcessRescindOffer,

			      channel);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -515,7 +505,6 @@ static void VmbusChannelOnOfferRescind(struct vmbus_channel_message_header *hdr) 
static void VmbusChannelOnOffersDelivered(

			struct vmbus_channel_message_header *hdr)

{

	DPRINT_EXIT(VMBUS);

}



/*
@@ -560,8 +549,6 @@ static void VmbusChannelOnOpenResult(struct vmbus_channel_message_header *hdr) 
		}

	}

	spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -610,8 +597,6 @@ static void VmbusChannelOnGpadlCreated(struct vmbus_channel_message_header *hdr) 
		}

	}

	spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -656,8 +641,6 @@ static void VmbusChannelOnGpadlTorndown( 
		}

	}

	spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);



	DPRINT_EXIT(VMBUS);

}



/*
@@ -695,8 +678,6 @@ static void VmbusChannelOnVersionResponse( 
		}

	}

	spin_unlock_irqrestore(&gVmbusConnection.channelmsg_lock, flags);



	DPRINT_EXIT(VMBUS);

}



/* Channel message dispatch table */
@@ -755,7 +736,6 @@ void VmbusOnChannelMessage(void *Context) 


	/* Free the msg that was allocated in VmbusOnMsgDPC() */

	kfree(msg);

	DPRINT_EXIT(VMBUS);

}



/*
@@ -812,7 +792,6 @@ Cleanup: 
		kfree(msgInfo);

	}



	DPRINT_EXIT(VMBUS);

	return ret;

}

drivers/staging/hv/connection.c

+1 −14
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ int VmbusConnect(void) 


	kfree(msgInfo->WaitEvent);

	kfree(msgInfo);

	DPRINT_EXIT(VMBUS);



	return 0;



Cleanup:
@@ -178,8 +176,6 @@ Cleanup: 
		kfree(msgInfo);

	}



	DPRINT_EXIT(VMBUS);



	return ret;

}
@@ -217,7 +213,6 @@ int VmbusDisconnect(void) 


Cleanup:

	kfree(msg);

	DPRINT_EXIT(VMBUS);

	return ret;

}
@@ -304,8 +299,6 @@ void VmbusOnEvents(void) 
			}

		 }

	}

	DPRINT_EXIT(VMBUS);



	return;

}
@@ -326,16 +319,10 @@ int VmbusPostMessage(void *buffer, size_t bufferLen) 
 */

int VmbusSetEvent(u32 childRelId)

{

	int ret = 0;



	/* Each u32 represents 32 channels */

	set_bit(childRelId & 31,

		(unsigned long *)gVmbusConnection.SendInterruptPage +

		(childRelId >> 5));



	ret = HvSignalEvent();



	DPRINT_EXIT(VMBUS);



	return ret;

	return HvSignalEvent();

}