svn commit: r302868 - head/sys/dev/hyperv/vmbus

[Sepherosa Ziehau]

Author: sephe
Date: Fri Jul 15 05:06:15 2016
New Revision: 302868
URL: https://svnweb.freebsd.org/changeset/base/302868

Log:
  hyperv/vmbus: Function rename
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D7129

Modified:
  head/sys/dev/hyperv/vmbus/hv_channel.c
  head/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  head/sys/dev/hyperv/vmbus/vmbus.c
  head/sys/dev/hyperv/vmbus/vmbus_var.h

Modified: head/sys/dev/hyperv/vmbus/hv_channel.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/hv_channel.c	Fri Jul 15 04:54:07 2016	(r302867)
+++ head/sys/dev/hyperv/vmbus/hv_channel.c	Fri Jul 15 05:06:15 2016	(r302868)
@@ -1233,7 +1233,7 @@ vmbus_chan_msgproc_choffer(struct vmbus_
 		 * 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 
 
 	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_soft
 		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);

Modified: head/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
==============================================================================
--- head/sys/dev/hyperv/vmbus/hv_vmbus_priv.h	Fri Jul 15 04:54:07 2016	(r302867)
+++ head/sys/dev/hyperv/vmbus/hv_vmbus_priv.h	Fri Jul 15 05:06:15 2016	(r302868)
@@ -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__ */

Modified: head/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus.c	Fri Jul 15 04:54:07 2016	(r302867)
+++ head/sys/dev/hyperv/vmbus/vmbus.c	Fri Jul 15 05:06:15 2016	(r302868)
@@ -1021,7 +1021,7 @@ vmbus_child_pnpinfo_str(device_t dev, de
 }
 
 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;
 

Modified: head/sys/dev/hyperv/vmbus/vmbus_var.h
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_var.h	Fri Jul 15 04:54:07 2016	(r302867)
+++ head/sys/dev/hyperv/vmbus/vmbus_var.h	Fri Jul 15 05:06:15 2016	(r302868)
@@ -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 *);