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, 2 insertions, 1 deletions

diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index bdb3c0238487..d32057b42238 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -439,9 +439,10 @@ amr_startup(struct amr_softc *sc)
 	    }
 	    dr->al_cylinders = dr->al_size / (dr->al_heads * dr->al_sectors);
 	    
-	    dr->al_disk = device_add_child(sc->amr_dev, NULL, -1, dr);
+	    dr->al_disk = device_add_child(sc->amr_dev, NULL, -1);
 	    if (dr->al_disk == 0)
 		device_printf(sc->amr_dev, "device_add_child failed\n");
+	    device_set_ivars(dr->al_disk, dr);
 	}
     }