summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcegger <cegger@NetBSD.org>2008-06-11 19:28:52 +0000
committercegger <cegger@NetBSD.org>2008-06-11 19:28:52 +0000
commit6a2e2c8cfd50c64fbea95b584cc3576d9bdf5cfc (patch)
tree194baf61728ba91be4bdde8076165014116a7289 /sys/dev
parent78ad67cc02ea007b09a4bd5cc162825160ba0cf3 (diff)
use device_lookup_private to get softc
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ppbus/pps_ppbus.c10
-rw-r--r--sys/dev/spi/spiflash.c15
2 files changed, 14 insertions, 11 deletions
diff --git a/sys/dev/ppbus/pps_ppbus.c b/sys/dev/ppbus/pps_ppbus.c
index 26b28cbfce0..0df6714a69b 100644
--- a/sys/dev/ppbus/pps_ppbus.c
+++ b/sys/dev/ppbus/pps_ppbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pps_ppbus.c,v 1.13 2008/04/21 12:56:31 ad Exp $ */
+/* $NetBSD: pps_ppbus.c,v 1.14 2008/06/11 19:28:52 cegger Exp $ */
/*
* ported to timecounters by Frank Kardel 2006
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.13 2008/04/21 12:56:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.14 2008/06/11 19:28:52 cegger Exp $");
#include "opt_ntp.h"
@@ -97,7 +97,7 @@ ppsopen(dev_t dev, int flags, int fmt, struct lwp *l)
struct pps_softc *sc;
int res, weg = 0;
- sc = device_lookup(&pps_cd, minor(dev));
+ sc = device_lookup_private(&pps_cd, minor(dev));
if (!sc)
return (ENXIO);
@@ -136,7 +136,7 @@ ppsopen(dev_t dev, int flags, int fmt, struct lwp *l)
static int
ppsclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
- struct pps_softc *sc = device_lookup(&pps_cd, minor(dev));
+ struct pps_softc *sc = device_lookup_private(&pps_cd, minor(dev));
device_t ppbus = sc->ppbus;
sc->busy = 0;
@@ -176,7 +176,7 @@ ppsintr(void *arg)
static int
ppsioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
- struct pps_softc *sc = device_lookup(&pps_cd, minor(dev));
+ struct pps_softc *sc = device_lookup_private(&pps_cd, minor(dev));
int error = 0;
switch (cmd) {
diff --git a/sys/dev/spi/spiflash.c b/sys/dev/spi/spiflash.c
index e3b10062420..b7006e8f821 100644
--- a/sys/dev/spi/spiflash.c
+++ b/sys/dev/spi/spiflash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.8 2008/05/04 14:21:56 xtraeme Exp $ */
+/* $NetBSD: spiflash.c,v 1.9 2008/06/11 19:31:10 cegger Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.8 2008/05/04 14:21:56 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.9 2008/06/11 19:31:10 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -245,7 +245,8 @@ spiflash_open(dev_t dev, int flags, int mode, struct lwp *l)
{
spiflash_handle_t sc;
- if ((sc = device_lookup(&spiflash_cd, DISKUNIT(dev))) == NULL)
+ sc = device_lookup_private(&spiflash_cd, DISKUNIT(dev));
+ if (sc == NULL)
return ENXIO;
/*
@@ -268,7 +269,8 @@ spiflash_close(dev_t dev, int flags, int mode, struct lwp *l)
{
spiflash_handle_t sc;
- if ((sc = device_lookup(&spiflash_cd, DISKUNIT(dev))) == NULL)
+ sc = device_lookup_private(&spiflash_cd, DISKUNIT(dev));
+ if (sc == NULL)
return ENXIO;
return 0;
@@ -293,7 +295,8 @@ spiflash_ioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
{
spiflash_handle_t sc;
- if ((sc = device_lookup(&spiflash_cd, DISKUNIT(dev))) == NULL)
+ sc = device_lookup_private(&spiflash_cd, DISKUNIT(dev));
+ if (sc == NULL)
return ENXIO;
return EINVAL;
@@ -305,7 +308,7 @@ spiflash_strategy(struct buf *bp)
spiflash_handle_t sc;
int s;
- sc = device_lookup(&spiflash_cd, DISKUNIT(bp->b_dev));
+ sc = device_lookup_private(&spiflash_cd, DISKUNIT(bp->b_dev));
if (sc == NULL) {
bp->b_error = ENXIO;
biodone(bp);