diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-11 16:07:03 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-11 16:07:03 +0000 |
| commit | ca6d8af89a72201986473d8cb000d091063097ca (patch) | |
| tree | 637cf0fda218c2cec40e1323667040f1761432bc /sys/dev/pci/cs4280.c | |
| parent | adaf58bdb03df7ca0d5ca5d5f4ff6f89cc946cae (diff) | |
Replace mountroothook_establish(9) by config_mountroot(9) a narrower API
similar to config_defer(9).
ok mikeb@, deraadt@
Diffstat (limited to 'sys/dev/pci/cs4280.c')
| -rw-r--r-- | sys/dev/pci/cs4280.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 8a4cf871614..8f6e6cf688b 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.47 2015/05/11 06:46:22 ratchov Exp $ */ +/* $OpenBSD: cs4280.c,v 1.48 2015/12/11 16:07:01 mpi Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -165,7 +165,7 @@ struct cs4280_softc { int cs4280_match(struct device *, void *, void *); void cs4280_attach(struct device *, struct device *, void *); int cs4280_activate(struct device *, int); -void cs4280_attachhook(void *xsc); +void cs4280_attachhook(struct device *); int cs4280_intr(void *); void cs4280_reset(void *); int cs4280_download_image(struct cs4280_softc *); @@ -539,9 +539,9 @@ cs4280_set_dac_rate(struct cs4280_softc *sc, int rate) } void -cs4280_attachhook(void *xsc) +cs4280_attachhook(struct device *self) { - struct cs4280_softc *sc = xsc; + struct cs4280_softc *sc = (struct cs4280_softc *)self; mixer_ctrl_t ctl; /* Initialization */ @@ -565,7 +565,7 @@ cs4280_attachhook(void *xsc) ctl.dev = cs4280_get_portnum_by_name(sc, AudioCinputs, AudioNcd, AudioNmute); cs4280_mixer_set_port(sc, &ctl); - + audio_attach_mi(&cs4280_hw_if, sc, &sc->sc_dev); #if NMIDI > 0 @@ -632,7 +632,7 @@ cs4280_attach(struct device *parent, struct device *self, void *aux) if (cs4280_init(sc, 1) != 0) return; - mountroothook_establish(cs4280_attachhook, sc); + config_mountroot(self, cs4280_attachhook); /* AC 97 attachement */ sc->host_if.arg = sc; |