aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@vmware.com>2013-01-10 18:41:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 15:07:39 -0500
commite6389a13e42d5388ec044ce8da1b3bcfa39598ef (patch)
treefe763613c17a8750686191a663bd4373288fc146 /drivers/misc
parent0e7894dc82bd9d4d82c16d16189f58da6d41d018 (diff)
VMCI: rename PPNset to ppn_set to avoid camel case
Acked-by: Andy King <acking@vmware.com> Signed-off-by: Dmitry Torokhov <dtor@vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/vmw_vmci/vmci_queue_pair.c8
-rw-r--r--drivers/misc/vmw_vmci/vmci_queue_pair.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index 6417a26df8d8..ef81fec0fcb4 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -231,7 +231,7 @@ struct qp_guest_endpoint {
231 u64 num_ppns; 231 u64 num_ppns;
232 void *produce_q; 232 void *produce_q;
233 void *consume_q; 233 void *consume_q;
234 struct PPNSet ppn_set; 234 struct ppn_set ppn_set;
235}; 235};
236 236
237struct qp_list { 237struct qp_list {
@@ -461,7 +461,7 @@ static int __qp_memcpy_from_queue(void *dest,
461static int qp_alloc_ppn_set(void *prod_q, 461static int qp_alloc_ppn_set(void *prod_q,
462 u64 num_produce_pages, 462 u64 num_produce_pages,
463 void *cons_q, 463 void *cons_q,
464 u64 num_consume_pages, struct PPNSet *ppn_set) 464 u64 num_consume_pages, struct ppn_set *ppn_set)
465{ 465{
466 u32 *produce_ppns; 466 u32 *produce_ppns;
467 u32 *consume_ppns; 467 u32 *consume_ppns;
@@ -532,7 +532,7 @@ static int qp_alloc_ppn_set(void *prod_q,
532/* 532/*
533 * Frees the two list of PPNs for a queue pair. 533 * Frees the two list of PPNs for a queue pair.
534 */ 534 */
535static void qp_free_ppn_set(struct PPNSet *ppn_set) 535static void qp_free_ppn_set(struct ppn_set *ppn_set)
536{ 536{
537 if (ppn_set->initialized) { 537 if (ppn_set->initialized) {
538 /* Do not call these functions on NULL inputs. */ 538 /* Do not call these functions on NULL inputs. */
@@ -546,7 +546,7 @@ static void qp_free_ppn_set(struct PPNSet *ppn_set)
546 * Populates the list of PPNs in the hypercall structure with the PPNS 546 * Populates the list of PPNs in the hypercall structure with the PPNS
547 * of the produce queue and the consume queue. 547 * of the produce queue and the consume queue.
548 */ 548 */
549static int qp_populate_ppn_set(u8 *call_buf, const struct PPNSet *ppn_set) 549static int qp_populate_ppn_set(u8 *call_buf, const struct ppn_set *ppn_set)
550{ 550{
551 memcpy(call_buf, ppn_set->produce_ppns, 551 memcpy(call_buf, ppn_set->produce_ppns,
552 ppn_set->num_produce_pages * sizeof(*ppn_set->produce_ppns)); 552 ppn_set->num_produce_pages * sizeof(*ppn_set->produce_ppns));
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.h b/drivers/misc/vmw_vmci/vmci_queue_pair.h
index 8d8d6a1170c3..58c6959f6b6d 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.h
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.h
@@ -25,7 +25,7 @@
25typedef int (*vmci_event_release_cb) (void *client_data); 25typedef int (*vmci_event_release_cb) (void *client_data);
26 26
27/* Guest device port I/O. */ 27/* Guest device port I/O. */
28struct PPNSet { 28struct ppn_set {
29 u64 num_produce_pages; 29 u64 num_produce_pages;
30 u64 num_consume_pages; 30 u64 num_consume_pages;
31 u32 *produce_ppns; 31 u32 *produce_ppns;