Commit 5a668d8c authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

vmbus: remove unused vmubs_sendpacket_pagebuffer_ctl 



The function vmbus_sendpacket_pagebuffer_ctl was never used directly.
Just have vmbus_send_pagebuffer

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a603b8e

drivers/hv/channel.c

+6 −24
Original line number Diff line number Diff line
@@ -702,16 +702,16 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, 
EXPORT_SYMBOL(vmbus_sendpacket);



/*

 * vmbus_sendpacket_pagebuffer_ctl - Send a range of single-page buffer

 * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer

 * packets using a GPADL Direct packet type. This interface allows you

 * to control notifying the host. This will be useful for sending

 * batched data. Also the sender can control the send flags

 * explicitly.

 */

int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,

int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,

				struct hv_page_buffer pagebuffers[],

				u32 pagecount, void *buffer, u32 bufferlen,

				    u64 requestid, u32 flags)

				u64 requestid)

{

	int i;

	struct vmbus_channel_packet_page_buffer desc;
@@ -736,7 +736,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel, 


	/* Setup the descriptor */

	desc.type = VM_PKT_DATA_USING_GPA_DIRECT;

	desc.flags = flags;

	desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */

	desc.length8 = (u16)(packetlen_aligned >> 3);

	desc.transactionid = requestid;
@@ -757,24 +757,6 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel, 


	return hv_ringbuffer_write(channel, bufferlist, 3);

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer_ctl);



/*

 * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer

 * packets using a GPADL Direct packet type.

 */

int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,

				     struct hv_page_buffer pagebuffers[],

				     u32 pagecount, void *buffer, u32 bufferlen,

				     u64 requestid)

{

	u32 flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;



	return vmbus_sendpacket_pagebuffer_ctl(channel, pagebuffers, pagecount,

					       buffer, bufferlen,

					       requestid, flags);



}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);



/*

drivers/net/hyperv/netvsc.c

+4 −6
Original line number Diff line number Diff line
@@ -775,12 +775,10 @@ static inline int netvsc_send_pkt( 
		if (packet->cp_partial)

			pb += packet->rmsg_pgcnt;



		ret = vmbus_sendpacket_pagebuffer_ctl(out_channel,

		ret = vmbus_sendpacket_pagebuffer(out_channel,

						  pb, packet->page_buf_cnt,

						      &nvmsg,

						      sizeof(struct nvsp_message),

						      req_id,

						      VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);

						  &nvmsg, sizeof(nvmsg),

						  req_id);

	} else {

		ret = vmbus_sendpacket_ctl(out_channel, &nvmsg,

					   sizeof(struct nvsp_message),

include/linux/hyperv.h

+0 −8
Original line number Diff line number Diff line
@@ -1044,14 +1044,6 @@ extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, 
					    u32 bufferlen,

					    u64 requestid);



extern int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,

					   struct hv_page_buffer pagebuffers[],

					   u32 pagecount,

					   void *buffer,

					   u32 bufferlen,

					   u64 requestid,

					   u32 flags);



extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,

				     struct vmbus_packet_mpb_array *mpb,

				     u32 desc_size,