misc: vmw_vmci: Remove unused qpair functions

vmci_qpair_dequeue(), vmci_qpair_enqueue() and vmci_qpair_peek()
were added in 2013 by
commit 06164d2b72aa ("VMCI: queue pairs implementation.")

but have remained unused.

Remove them.

(The iov version of those functions is used)

Signed-off-by: "Dr. David Alan Gilbert" <linux@treblig.org>
Link: https://lore.kernel.org/r/20250614010344.636076-4-linux@treblig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index 73d71c4ec1399574c1a639a8ff892fec105ca5aa..b88ac144ad32127285d6586e6988e84b1fc63108 100644 (file)
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -3022,139 +3022,6 @@ s64 vmci_qpair_consume_buf_ready(const struct vmci_qp *qpair)
 }
 EXPORT_SYMBOL_GPL(vmci_qpair_consume_buf_ready);
 
-/*
- * vmci_qpair_enqueue() - Throw data on the queue.
- * @qpair:      Pointer to the queue pair struct.
- * @buf:        Pointer to buffer containing data
- * @buf_size:   Length of buffer.
- * @buf_type:   Buffer type (Unused).
- *
- * This is the client interface for enqueueing data into the queue.
- * Returns number of bytes enqueued or < 0 on error.
- */
-ssize_t vmci_qpair_enqueue(struct vmci_qp *qpair,
-                          const void *buf,
-                          size_t buf_size,
-                          int buf_type)
-{
-       ssize_t result;
-       struct iov_iter from;
-       struct kvec v = {.iov_base = (void *)buf, .iov_len = buf_size};
-
-       if (!qpair || !buf)
-               return VMCI_ERROR_INVALID_ARGS;
-
-       iov_iter_kvec(&from, ITER_SOURCE, &v, 1, buf_size);
-
-       qp_lock(qpair);
-
-       do {
-               result = qp_enqueue_locked(qpair->produce_q,
-                                          qpair->consume_q,
-                                          qpair->produce_q_size,
-                                          &from);
-
-               if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY &&
-                   !qp_wait_for_ready_queue(qpair))
-                       result = VMCI_ERROR_WOULD_BLOCK;
-
-       } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY);
-
-       qp_unlock(qpair);
-
-       return result;
-}
-EXPORT_SYMBOL_GPL(vmci_qpair_enqueue);
-
-/*
- * vmci_qpair_dequeue() - Get data from the queue.
- * @qpair:      Pointer to the queue pair struct.
- * @buf:        Pointer to buffer for the data
- * @buf_size:   Length of buffer.
- * @buf_type:   Buffer type (Unused).
- *
- * This is the client interface for dequeueing data from the queue.
- * Returns number of bytes dequeued or < 0 on error.
- */
-ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair,
-                          void *buf,
-                          size_t buf_size,
-                          int buf_type)
-{
-       ssize_t result;
-       struct iov_iter to;
-       struct kvec v = {.iov_base = buf, .iov_len = buf_size};
-
-       if (!qpair || !buf)
-               return VMCI_ERROR_INVALID_ARGS;
-
-       iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
-
-       qp_lock(qpair);
-
-       do {
-               result = qp_dequeue_locked(qpair->produce_q,
-                                          qpair->consume_q,
-                                          qpair->consume_q_size,
-                                          &to, true);
-
-               if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY &&
-                   !qp_wait_for_ready_queue(qpair))
-                       result = VMCI_ERROR_WOULD_BLOCK;
-
-       } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY);
-
-       qp_unlock(qpair);
-
-       return result;
-}
-EXPORT_SYMBOL_GPL(vmci_qpair_dequeue);
-
-/*
- * vmci_qpair_peek() - Peek at the data in the queue.
- * @qpair:      Pointer to the queue pair struct.
- * @buf:        Pointer to buffer for the data
- * @buf_size:   Length of buffer.
- * @buf_type:   Buffer type (Unused on Linux).
- *
- * This is the client interface for peeking into a queue.  (I.e.,
- * copy data from the queue without updating the head pointer.)
- * Returns number of bytes dequeued or < 0 on error.
- */
-ssize_t vmci_qpair_peek(struct vmci_qp *qpair,
-                       void *buf,
-                       size_t buf_size,
-                       int buf_type)
-{
-       struct iov_iter to;
-       struct kvec v = {.iov_base = buf, .iov_len = buf_size};
-       ssize_t result;
-
-       if (!qpair || !buf)
-               return VMCI_ERROR_INVALID_ARGS;
-
-       iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
-
-       qp_lock(qpair);
-
-       do {
-               result = qp_dequeue_locked(qpair->produce_q,
-                                          qpair->consume_q,
-                                          qpair->consume_q_size,
-                                          &to, false);
-
-               if (result == VMCI_ERROR_QUEUEPAIR_NOT_READY &&
-                   !qp_wait_for_ready_queue(qpair))
-                       result = VMCI_ERROR_WOULD_BLOCK;
-
-       } while (result == VMCI_ERROR_QUEUEPAIR_NOT_READY);
-
-       qp_unlock(qpair);
-
-       return result;
-}
-EXPORT_SYMBOL_GPL(vmci_qpair_peek);
-
 /*
  * vmci_qpair_enquev() - Throw data on the queue using iov.
  * @qpair:      Pointer to the queue pair struct.

diff --git a/include/linux/vmw_vmci_api.h b/include/linux/vmw_vmci_api.h
index 28a3b6a9e1cafa4ac441e6ec8a91bb7ad1e71f30..41764a684423dca2daea206fd7f87e86a2d77bd2 100644 (file)
--- a/include/linux/vmw_vmci_api.h
+++ b/include/linux/vmw_vmci_api.h
@@ -60,12 +60,6 @@ s64 vmci_qpair_produce_free_space(const struct vmci_qp *qpair);
 s64 vmci_qpair_produce_buf_ready(const struct vmci_qp *qpair);
 s64 vmci_qpair_consume_free_space(const struct vmci_qp *qpair);
 s64 vmci_qpair_consume_buf_ready(const struct vmci_qp *qpair);
-ssize_t vmci_qpair_enqueue(struct vmci_qp *qpair,
-                          const void *buf, size_t buf_size, int mode);
-ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair,
-                          void *buf, size_t buf_size, int mode);
-ssize_t vmci_qpair_peek(struct vmci_qp *qpair, void *buf, size_t buf_size,
-                       int mode);
 ssize_t vmci_qpair_enquev(struct vmci_qp *qpair,
                          struct msghdr *msg, size_t iov_size, int mode);
 ssize_t vmci_qpair_dequev(struct vmci_qp *qpair,