Remove the 'ivars' arguement to device_add_child() and

device_add_child_ordered().  'ivars' may now be set using the
device_set_ivars() function.

This makes it easier for us to change how arbitrary data structures are
associated with a device_t.  Eventually we won't be modifying device_t
to add additional pointers for ivars, softc data etc.

Despite my best efforts I've probably forgotten something so let me know
if this breaks anything.  I've been running with this change for months
and its been quite involved actually isolating all the changes from
the rest of the local changes in my tree.

Reviewed by:	peter, dfr

1 files changed, 3 insertions, 4 deletions

diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 5c32be7..a3cea15 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -222,11 +222,9 @@ void	bus_delete_resource(device_t dev, int type, int rid);
 /*
  * Access functions for device.
  */
-device_t	device_add_child(device_t dev, const char *name, int unit,
-				 void *ivp);
+device_t	device_add_child(device_t dev, const char *name, int unit);
 device_t	device_add_child_ordered(device_t dev, int order,
-					 const char *name, int unit,
-					 void *ivp);
+					 const char *name, int unit);
 void	device_busy(device_t dev);
 int	device_delete_child(device_t dev, device_t child);
 int	device_detach(device_t dev);
@@ -241,6 +239,7 @@ u_int32_t	device_get_flags(device_t dev);
 device_t	device_get_parent(device_t dev);
 int	device_get_children(device_t dev, device_t **listp, int *countp);
 void	*device_get_ivars(device_t dev);
+void	device_set_ivars(device_t dev, void *ivars);
 const	char *device_get_name(device_t dev);
 const	char *device_get_nameunit(device_t dev);
 void	*device_get_softc(device_t dev);