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

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

Staging: hv: storvsc: call vmbus_sendpacket directly 



Don't do the interface indirection, it's not needed at all.

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

drivers/staging/hv/storvsc.c

+30 −36
Original line number Original line Diff line number Diff line
@@ -213,8 +213,7 @@ static int StorVscChannelInit(struct hv_device *Device) 




	DPRINT_INFO(STORVSC, "BEGIN_INITIALIZATION_OPERATION...");

	DPRINT_INFO(STORVSC, "BEGIN_INITIALIZATION_OPERATION...");





	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

	ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

			       sizeof(struct vstor_packet),

			       sizeof(struct vstor_packet),

			       (unsigned long)request,

			       (unsigned long)request,

			       VmbusPacketTypeDataInBand,

			       VmbusPacketTypeDataInBand,
@@ -245,8 +244,7 @@ static int StorVscChannelInit(struct hv_device *Device) 
	vstorPacket->Version.MajorMinor = VMSTOR_PROTOCOL_VERSION_CURRENT;

	vstorPacket->Version.MajorMinor = VMSTOR_PROTOCOL_VERSION_CURRENT;

	FILL_VMSTOR_REVISION(vstorPacket->Version.Revision);

	FILL_VMSTOR_REVISION(vstorPacket->Version.Revision);





	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

	ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

			       sizeof(struct vstor_packet),

			       sizeof(struct vstor_packet),

			       (unsigned long)request,

			       (unsigned long)request,

			       VmbusPacketTypeDataInBand,

			       VmbusPacketTypeDataInBand,
@@ -277,8 +275,7 @@ static int StorVscChannelInit(struct hv_device *Device) 
	vstorPacket->StorageChannelProperties.PortNumber =

	vstorPacket->StorageChannelProperties.PortNumber =

					storDevice->PortNumber;

					storDevice->PortNumber;





	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

	ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

			       sizeof(struct vstor_packet),

			       sizeof(struct vstor_packet),

			       (unsigned long)request,

			       (unsigned long)request,

			       VmbusPacketTypeDataInBand,

			       VmbusPacketTypeDataInBand,
@@ -314,8 +311,7 @@ static int StorVscChannelInit(struct hv_device *Device) 
	vstorPacket->Operation = VStorOperationEndInitialization;

	vstorPacket->Operation = VStorOperationEndInitialization;

	vstorPacket->Flags = REQUEST_COMPLETION_FLAG;

	vstorPacket->Flags = REQUEST_COMPLETION_FLAG;





	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

	ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

			       sizeof(struct vstor_packet),

			       sizeof(struct vstor_packet),

			       (unsigned long)request,

			       (unsigned long)request,

			       VmbusPacketTypeDataInBand,

			       VmbusPacketTypeDataInBand,
@@ -638,8 +634,7 @@ int StorVscOnHostReset(struct hv_device *Device) 
	vstorPacket->Flags = REQUEST_COMPLETION_FLAG;

	vstorPacket->Flags = REQUEST_COMPLETION_FLAG;

	vstorPacket->VmSrb.PathId = storDevice->PathId;

	vstorPacket->VmSrb.PathId = storDevice->PathId;





	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

	ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

			       sizeof(struct vstor_packet),

			       sizeof(struct vstor_packet),

			       (unsigned long)&storDevice->ResetRequest,

			       (unsigned long)&storDevice->ResetRequest,

			       VmbusPacketTypeDataInBand,

			       VmbusPacketTypeDataInBand,
@@ -741,8 +736,7 @@ static int StorVscOnIORequest(struct hv_device *Device, 
				sizeof(struct vstor_packet),

				sizeof(struct vstor_packet),

				(unsigned long)requestExtension);

				(unsigned long)requestExtension);

	} else {

	} else {

		ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

		ret = vmbus_sendpacket(Device->channel, vstorPacket,

				vstorPacket,

				       sizeof(struct vstor_packet),

				       sizeof(struct vstor_packet),

				       (unsigned long)requestExtension,

				       (unsigned long)requestExtension,

				       VmbusPacketTypeDataInBand,

				       VmbusPacketTypeDataInBand,