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

vmbus: remove unused vmbus_sendpacket_ctl 



The only usage of vmbus_sendpacket_ctl was by vmbus_sendpacket.

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

drivers/hv/channel.c

+17 −26
Original line number Diff line number Diff line
@@ -647,7 +647,21 @@ void vmbus_close(struct vmbus_channel *channel) 
}

EXPORT_SYMBOL_GPL(vmbus_close);



int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,

/**

 * vmbus_sendpacket() - Send the specified buffer on the given channel

 * @channel: Pointer to vmbus_channel structure.

 * @buffer: Pointer to the buffer you want to receive the data into.

 * @bufferlen: Maximum size of what the the buffer will hold

 * @requestid: Identifier of the request

 * @type: Type of packet that is being send e.g. negotiate, time

 * packet etc.

 *

 * Sends data in @buffer directly to hyper-v via the vmbus

 * This will send the data unparsed to hyper-v.

 *

 * Mainly used by Hyper-V drivers.

 */

int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer,

			   u32 bufferlen, u64 requestid,

			   enum vmbus_packet_type type, u32 flags)

{
@@ -676,29 +690,6 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer, 


	return hv_ringbuffer_write(channel, bufferlist, num_vecs);

}

EXPORT_SYMBOL(vmbus_sendpacket_ctl);



/**

 * vmbus_sendpacket() - Send the specified buffer on the given channel

 * @channel: Pointer to vmbus_channel structure.

 * @buffer: Pointer to the buffer you want to receive the data into.

 * @bufferlen: Maximum size of what the the buffer will hold

 * @requestid: Identifier of the request

 * @type: Type of packet that is being send e.g. negotiate, time

 * packet etc.

 *

 * Sends data in @buffer directly to hyper-v via the vmbus

 * This will send the data unparsed to hyper-v.

 *

 * Mainly used by Hyper-V drivers.

 */

int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer,

			   u32 bufferlen, u64 requestid,

			   enum vmbus_packet_type type, u32 flags)

{

	return vmbus_sendpacket_ctl(channel, buffer, bufferlen, requestid,

				    type, flags);

}

EXPORT_SYMBOL(vmbus_sendpacket);



/*

drivers/net/hyperv/netvsc.c

+4 −5
Original line number Diff line number Diff line
@@ -780,10 +780,9 @@ static inline int netvsc_send_pkt( 
						  &nvmsg, sizeof(nvmsg),

						  req_id);

	} else {

		ret = vmbus_sendpacket_ctl(out_channel, &nvmsg,

					   sizeof(struct nvsp_message),

					   req_id,

					   VM_PKT_DATA_INBAND,

		ret = vmbus_sendpacket(out_channel,

				       &nvmsg, sizeof(nvmsg),

				       req_id, VM_PKT_DATA_INBAND,

				       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);

	}

include/linux/hyperv.h

+0 −7
Original line number Diff line number Diff line
@@ -1030,13 +1030,6 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel, 
				  enum vmbus_packet_type type,

				  u32 flags);



extern int vmbus_sendpacket_ctl(struct vmbus_channel *channel,

				  void *buffer,

				  u32 bufferLen,

				  u64 requestid,

				  enum vmbus_packet_type type,

				  u32 flags);



extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,

					    struct hv_page_buffer pagebuffers[],

					    u32 pagecount,