vmbus: remove unused vmbus_sendpacket_ctl

The only usage of vmbus_sendpacket_ctl was by vmbus_sendpacket.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 9223fe8823e0d11f031d80f21c7dd1bef3f79630..d9e9676e2b40affe8002b5201bbaa8761197b119 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -647,9 +647,23 @@ void vmbus_close(struct vmbus_channel *channel)
 }
 EXPORT_SYMBOL_GPL(vmbus_close);
 
-int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
-                        u32 bufferlen, u64 requestid,
-                        enum vmbus_packet_type type, u32 flags)
+/**
+ * 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)
 {
        struct vmpacket_descriptor desc;
        u32 packetlen = sizeof(struct vmpacket_descriptor) + bufferlen;
@@ -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);
 
 /*

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 6031102cbba35ff5b21a7868e947fceaafd7b780..0062b802676fb5c4318b0e14f96133b849b66bc2 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -780,11 +780,10 @@ 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,
-                                          VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+               ret = vmbus_sendpacket(out_channel,
+                                      &nvmsg, sizeof(nvmsg),
+                                      req_id, VM_PKT_DATA_INBAND,
+                                      VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
        }
 
        if (ret == 0) {

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 9692592d43a336c5decd2efaa4388c6429e0c7bf..a5f961c4149ec80301ef8a6cdd067def31ac7030 100644 (file)
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -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,