diff options
| author | cegger <cegger@NetBSD.org> | 2008-06-12 21:46:21 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2008-06-12 21:46:21 +0000 |
| commit | 17dbee905cecdde65750df0e8b2e2b2be46c86d7 (patch) | |
| tree | c4f08837b022aa5ae3ccf2ac4a0faeed467522e8 /sys/dev | |
| parent | b0e5b3dc77011fd80fe0a8fccde4da80334771c2 (diff) | |
use device_lookup_private to get softc
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/pckbc_acpi.c | 6 | ||||
| -rw-r--r-- | sys/dev/apm/apm.c | 17 | ||||
| -rw-r--r-- | sys/dev/ata/ata.c | 14 | ||||
| -rw-r--r-- | sys/dev/bi/kdb.c | 9 | ||||
| -rw-r--r-- | sys/dev/bluetooth/bcsp.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/bthub.c | 6 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btuart.c | 6 | ||||
| -rw-r--r-- | sys/dev/eisa/if_fea.c | 6 |
8 files changed, 33 insertions, 37 deletions
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c index fb28c3458c9..2960f6f257e 100644 --- a/sys/dev/acpi/pckbc_acpi.c +++ b/sys/dev/acpi/pckbc_acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_acpi.c,v 1.28 2008/05/03 16:14:40 jmcneill Exp $ */ +/* $NetBSD: pckbc_acpi.c,v 1.29 2008/06/12 21:46:21 cegger Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.28 2008/05/03 16:14:40 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.29 2008/06/12 21:46:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -247,7 +247,7 @@ pckbc_acpi_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot) * Note we're always called with sc == first. */ for (i = 0; i < pckbc_cd.cd_ndevs; i++) { - psc = device_private(pckbc_cd.cd_devs[i]); + psc = device_lookup_private(&pckbc_cd, i); if (psc && psc->sc_slot == slot) { irq = psc->sc_irq; ist = psc->sc_ist; diff --git a/sys/dev/apm/apm.c b/sys/dev/apm/apm.c index 5119bf7fd56..cdd6ffa8800 100644 --- a/sys/dev/apm/apm.c +++ b/sys/dev/apm/apm.c @@ -1,4 +1,4 @@ -/* $NetBSD: apm.c,v 1.21 2008/04/28 20:23:47 martin Exp $ */ +/* $NetBSD: apm.c,v 1.22 2008/06/12 21:47:46 cegger Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.21 2008/04/28 20:23:47 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.22 2008/06/12 21:47:46 cegger Exp $"); #include "opt_apm.h" @@ -702,14 +702,11 @@ apm_thread(void *arg) int apmopen(dev_t dev, int flag, int mode, struct lwp *l) { - int unit = APMUNIT(dev); int ctl = APM(dev); int error = 0; struct apm_softc *sc; - if (unit >= apm_cd.cd_ndevs) - return ENXIO; - sc = device_private(apm_cd.cd_devs[unit]); + sc = device_lookup_private(&apm_cd, APMUNIT(dev)); if (!sc) return ENXIO; @@ -752,7 +749,7 @@ int apmclose(dev_t dev, int flag, int mode, struct lwp *l) { - struct apm_softc *sc = device_private(apm_cd.cd_devs[APMUNIT(dev)]); + struct apm_softc *sc = device_lookup_private(&apm_cd, APMUNIT(dev)); int ctl = APM(dev); DPRINTF(APMDEBUG_DEVICE, @@ -779,7 +776,7 @@ int apmioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) { - struct apm_softc *sc = device_private(apm_cd.cd_devs[APMUNIT(dev)]); + struct apm_softc *sc = device_lookup_private(&apm_cd, APMUNIT(dev)); struct apm_power_info *powerp; struct apm_event_info *evp; #if 0 @@ -878,7 +875,7 @@ apmioctl(dev_t dev, u_long cmd, void *data, int flag, int apmpoll(dev_t dev, int events, struct lwp *l) { - struct apm_softc *sc = device_private(apm_cd.cd_devs[APMUNIT(dev)]); + struct apm_softc *sc = device_lookup_private(&apm_cd, APMUNIT(dev)); int revents = 0; APM_LOCK(sc); @@ -918,7 +915,7 @@ static const struct filterops apmread_filtops = int apmkqfilter(dev_t dev, struct knote *kn) { - struct apm_softc *sc = device_private(apm_cd.cd_devs[APMUNIT(dev)]); + struct apm_softc *sc = device_lookup_private(&apm_cd, APMUNIT(dev)); struct klist *klist; switch (kn->kn_filter) { diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index 2ee23429346..3a7dc94d5ec 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.98 2008/03/18 20:46:36 cube Exp $ */ +/* $NetBSD: ata.c,v 1.99 2008/06/12 21:46:35 cegger Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.98 2008/03/18 20:46:36 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.99 2008/06/12 21:46:35 cegger Exp $"); #include "opt_ata.h" @@ -1411,10 +1411,10 @@ atabusopen(dev_t dev, int flag, int fmt, struct lwp *l) { struct atabus_softc *sc; - int error, unit = minor(dev); + int error; - if (unit >= atabus_cd.cd_ndevs || - (sc = device_private(atabus_cd.cd_devs[unit])) == NULL) + sc = device_lookup_private(&atabus_cd, minor(dev)); + if (sc == NULL) return (ENXIO); if (sc->sc_flags & ATABUSCF_OPEN) @@ -1434,7 +1434,7 @@ atabusclose(dev_t dev, int flag, int fmt, struct lwp *l) { struct atabus_softc *sc = - device_private(atabus_cd.cd_devs[minor(dev)]); + device_lookup_private(&atabus_cd, minor(dev)); ata_delref(sc->sc_chan); @@ -1448,7 +1448,7 @@ atabusioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) { struct atabus_softc *sc = - device_private(atabus_cd.cd_devs[minor(dev)]); + device_lookup_private(&atabus_cd, minor(dev)); struct ata_channel *chp = sc->sc_chan; int min_drive, max_drive, drive; int error; diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c index 51637b9cc35..35695ce7030 100644 --- a/sys/dev/bi/kdb.c +++ b/sys/dev/bi/kdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: kdb.c,v 1.42 2008/03/11 05:34:01 matt Exp $ */ +/* $NetBSD: kdb.c,v 1.43 2008/06/12 21:48:01 cegger Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.42 2008/03/11 05:34:01 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.43 2008/06/12 21:48:01 cegger Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -310,12 +310,11 @@ kdbintr(void *arg) * and requeue outstanding I/O. */ void -kdbreset(ctlr) - int ctlr; +kdbreset(int ctlr) { struct kdb_softc *sc; - sc = kdb_cd.cd_devs[ctlr]; + sc = device_lookup_private(&kdb_cd, ctlr); printf(" kdb%d", ctlr); diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c index 3b283e5f3db..5c2942fc85a 100644 --- a/sys/dev/bluetooth/bcsp.c +++ b/sys/dev/bluetooth/bcsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcsp.c,v 1.12 2008/03/22 17:20:31 plunky Exp $ */ +/* $NetBSD: bcsp.c,v 1.13 2008/06/12 21:47:11 cegger Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.12 2008/03/22 17:20:31 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.13 2008/06/12 21:47:11 cegger Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -396,7 +396,7 @@ bcspopen(dev_t device __unused, struct tty *tp) cfdata = malloc(sizeof(struct cfdata), M_DEVBUF, M_WAITOK); for (unit = 0; unit < bcsp_cd.cd_ndevs; unit++) - if (bcsp_cd.cd_devs[unit] == NULL) + if (device_lookup(&bcsp_cd, unit) == NULL) break; cfdata->cf_name = name; cfdata->cf_atname = name; diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c index 2e1da378652..176472bebd4 100644 --- a/sys/dev/bluetooth/bthub.c +++ b/sys/dev/bluetooth/bthub.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthub.c,v 1.13 2008/03/28 21:17:37 plunky Exp $ */ +/* $NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.13 2008/03/28 21:17:37 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -171,7 +171,7 @@ bthub_pioctl(dev_t devno, unsigned long cmd, prop_dictionary_t dict, if (unit == bthub_cd.cd_ndevs) return ENXIO; - self = bthub_cd.cd_devs[unit]; + self = device_lookup(&bthub_cd, unit); if (self == NULL) continue; diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c index b0cdec8185e..de06972ab47 100644 --- a/sys/dev/bluetooth/btuart.c +++ b/sys/dev/bluetooth/btuart.c @@ -1,4 +1,4 @@ -/* $NetBSD: btuart.c,v 1.18 2008/04/15 11:17:48 plunky Exp $ */ +/* $NetBSD: btuart.c,v 1.19 2008/06/12 21:47:11 cegger Exp $ */ /*- * Copyright (c) 2006, 2007 KIYOHARA Takashi @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.18 2008/04/15 11:17:48 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.19 2008/06/12 21:47:11 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -244,7 +244,7 @@ btuartopen(dev_t devno __unused, struct tty *tp) cfdata = malloc(sizeof(struct cfdata), M_DEVBUF, M_WAITOK); for (unit = 0; unit < btuart_cd.cd_ndevs; unit++) - if (btuart_cd.cd_devs[unit] == NULL) + if (device_lookup(&btuart_cd, unit) == NULL) break; cfdata->cf_name = btuart_cd.cd_name; diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index c2a67eeecf3..3ccc59d60db 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fea.c,v 1.36 2008/04/06 08:54:43 cegger Exp $ */ +/* $NetBSD: if_fea.c,v 1.37 2008/06/12 21:48:16 cegger Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.36 2008/04/06 08:54:43 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.37 2008/06/12 21:48:16 cegger Exp $"); #include "opt_inet.h" @@ -116,7 +116,7 @@ static pdq_softc_t *pdqs_eisa[16]; #elif defined(__bsdi__) extern struct cfdriver feacd; -#define PDQ_EISA_UNIT_TO_SOFTC(unit) ((pdq_softc_t *)feacd.cd_devs[unit]) +#define PDQ_EISA_UNIT_TO_SOFTC(unit) ((pdq_softc_t *)device_lookup_private(&feacd, unit)) #define DEFEA_INTRENABLE 0x28 /* edge interrupt */ static const int pdq_eisa_irqs[4] = { IRQ9, IRQ10, IRQ11, IRQ15 }; #define DEFEA_DECODE_IRQ(n) (pdq_eisa_irqs[(n)]) |
