From 9ef62401307a77467dbc96d15227e07361d3508a Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Fri, 15 Jul 2016 05:06:15 +0000
Subject: [PATCH] hyperv/vmbus: Function rename

MFC after:	1 week
Sponsored by:	Microsoft OSTC
Differential Revision:	https://reviews.freebsd.org/D7129
---
 sys/dev/hyperv/vmbus/hv_channel.c    | 6 +++---
 sys/dev/hyperv/vmbus/hv_vmbus_priv.h | 5 -----
 sys/dev/hyperv/vmbus/vmbus.c         | 4 ++--
 sys/dev/hyperv/vmbus/vmbus_var.h     | 2 ++
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sys/dev/hyperv/vmbus/hv_channel.c b/sys/dev/hyperv/vmbus/hv_channel.c
index 89fdb7b0155..8976793e758 100644
--- a/sys/dev/hyperv/vmbus/hv_channel.c
+++ b/sys/dev/hyperv/vmbus/hv_channel.c
@@ -1233,7 +1233,7 @@ vmbus_chan_msgproc_choffer(struct vmbus_softc *sc,
 		 * Error is ignored here; don't have much to do if error
 		 * really happens.
 		 */
-		hv_vmbus_child_device_register(chan);
+		vmbus_add_child(chan);
 	}
 }
 
@@ -1274,7 +1274,7 @@ vmbus_chan_detach_task(void *xchan, int pending __unused)
 
 	if (VMBUS_CHAN_ISPRIMARY(chan)) {
 		/* Only primary channel owns the device */
-		hv_vmbus_child_device_unregister(chan);
+		vmbus_delete_child(chan);
 		/* NOTE: DO NOT free primary channel for now */
 	} else {
 		struct vmbus_softc *sc = chan->vmbus_sc;
@@ -1336,7 +1336,7 @@ vmbus_chan_destroy_all(struct vmbus_softc *sc)
 		TAILQ_REMOVE(&sc->vmbus_prichans, chan, ch_prilink);
 		mtx_unlock(&sc->vmbus_prichan_lock);
 
-		hv_vmbus_child_device_unregister(chan);
+		vmbus_delete_child(chan);
 		vmbus_chan_free(chan);
 
 		mtx_lock(&sc->vmbus_prichan_lock);
diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
index 06c550ab916..8c122c16f6b 100644
--- a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
@@ -123,9 +123,4 @@ void			hv_ring_buffer_read_begin(
 uint32_t		hv_ring_buffer_read_end(
 				hv_vmbus_ring_buffer_info	*ring_info);
 
-int			hv_vmbus_child_device_register(
-					struct hv_vmbus_channel *chan);
-int			hv_vmbus_child_device_unregister(
-					struct hv_vmbus_channel *chan);
-
 #endif  /* __HYPERV_PRIV_H__ */
diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c
index f71a351a40f..94531724ad3 100644
--- a/sys/dev/hyperv/vmbus/vmbus.c
+++ b/sys/dev/hyperv/vmbus/vmbus.c
@@ -1021,7 +1021,7 @@ vmbus_child_pnpinfo_str(device_t dev, device_t child, char *buf, size_t buflen)
 }
 
 int
-hv_vmbus_child_device_register(struct hv_vmbus_channel *chan)
+vmbus_add_child(struct hv_vmbus_channel *chan)
 {
 	struct vmbus_softc *sc = chan->vmbus_sc;
 	device_t parent = sc->vmbus_dev;
@@ -1046,7 +1046,7 @@ done:
 }
 
 int
-hv_vmbus_child_device_unregister(struct hv_vmbus_channel *chan)
+vmbus_delete_child(struct hv_vmbus_channel *chan)
 {
 	int error;
 
diff --git a/sys/dev/hyperv/vmbus/vmbus_var.h b/sys/dev/hyperv/vmbus/vmbus_var.h
index 924d2d308c8..73b58ca9a95 100644
--- a/sys/dev/hyperv/vmbus/vmbus_var.h
+++ b/sys/dev/hyperv/vmbus/vmbus_var.h
@@ -146,6 +146,8 @@ struct vmbus_msghc;
 void	vmbus_event_proc(struct vmbus_softc *, int);
 void	vmbus_event_proc_compat(struct vmbus_softc *, int);
 void	vmbus_handle_intr(struct trapframe *);
+int	vmbus_add_child(struct hv_vmbus_channel *);
+int	vmbus_delete_child(struct hv_vmbus_channel *);
 
 void	vmbus_et_intr(struct trapframe *);