summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2008-06-08 03:49:26 +0000
committertsutsui <tsutsui@NetBSD.org>2008-06-08 03:49:26 +0000
commitec3c45aecf6a5da7d411cd383f96fbb6dc8bfdc1 (patch)
tree2be43bbf3ed023bd57077c0513d8a60820fc6c1a /sys/dev
parentbb8100256bbe0229557ebe4c96dacbb21676d0be (diff)
Replace device_lookup() with device_lookup_private() to get softc
after device_t/softc split. PR kern/38885 from Jonathan A. Kollasch.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/i2c/at24cxx.c12
-rw-r--r--sys/dev/i2c/ds1307.c12
-rw-r--r--sys/dev/i2c/m41st84.c12
-rw-r--r--sys/dev/i2c/m41t00.c12
-rw-r--r--sys/dev/i2c/max6900.c12
-rw-r--r--sys/dev/i2c/pcf8583.c12
-rw-r--r--sys/dev/i2c/x1226.c12
7 files changed, 42 insertions, 42 deletions
diff --git a/sys/dev/i2c/at24cxx.c b/sys/dev/i2c/at24cxx.c
index 1191a7064e1..c17c9f45d05 100644
--- a/sys/dev/i2c/at24cxx.c
+++ b/sys/dev/i2c/at24cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxx.c,v 1.11 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: at24cxx.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.11 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ seeprom_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct seeprom_softc *sc;
- if ((sc = device_lookup(&seeprom_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&seeprom_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -201,7 +201,7 @@ seeprom_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct seeprom_softc *sc;
- if ((sc = device_lookup(&seeprom_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&seeprom_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -217,7 +217,7 @@ seeprom_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&seeprom_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&seeprom_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= sc->sc_size)
@@ -271,7 +271,7 @@ seeprom_write(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&seeprom_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&seeprom_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= sc->sc_size)
diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c
index 124a8575a4f..e5a0563c218 100644
--- a/sys/dev/i2c/ds1307.c
+++ b/sys/dev/i2c/ds1307.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.11 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: ds1307.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.11 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.12 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ dsrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct dsrtc_softc *sc;
- if ((sc = device_lookup(&dsrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -140,7 +140,7 @@ dsrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct dsrtc_softc *sc;
- if ((sc = device_lookup(&dsrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -155,7 +155,7 @@ dsrtc_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[1];
int a, error;
- if ((sc = device_lookup(&dsrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= DS1307_NVRAM_SIZE)
@@ -194,7 +194,7 @@ dsrtc_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&dsrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= DS1307_NVRAM_SIZE)
diff --git a/sys/dev/i2c/m41st84.c b/sys/dev/i2c/m41st84.c
index 3c89ba56c46..65b9d845687 100644
--- a/sys/dev/i2c/m41st84.c
+++ b/sys/dev/i2c/m41st84.c
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84.c,v 1.12 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: m41st84.c,v 1.13 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.12 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41st84.c,v 1.13 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ strtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct strtc_softc *sc;
- if ((sc = device_lookup(&strtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&strtc_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -138,7 +138,7 @@ strtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct strtc_softc *sc;
- if ((sc = device_lookup(&strtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&strtc_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -153,7 +153,7 @@ strtc_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[1];
int a, error;
- if ((sc = device_lookup(&strtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&strtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= M41ST84_USER_RAM_SIZE)
@@ -192,7 +192,7 @@ strtc_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&strtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&strtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= M41ST84_USER_RAM_SIZE)
diff --git a/sys/dev/i2c/m41t00.c b/sys/dev/i2c/m41t00.c
index 94529be2133..635ea1f4e9c 100644
--- a/sys/dev/i2c/m41t00.c
+++ b/sys/dev/i2c/m41t00.c
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t00.c,v 1.14 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: m41t00.c,v 1.15 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.14 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.15 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@ m41t00_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct m41t00_softc *sc;
- if ((sc = device_lookup(&m41trtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&m41trtc_cd, minor(dev))) == NULL)
return ENXIO;
/* XXX: Locking */
@@ -143,7 +143,7 @@ m41t00_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct m41t00_softc *sc;
- if ((sc = device_lookup(&m41trtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&m41trtc_cd, minor(dev))) == NULL)
return ENXIO;
sc->sc_open = 0;
@@ -158,7 +158,7 @@ m41t00_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[1];
int a, error;
- if ((sc = device_lookup(&m41trtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&m41trtc_cd, minor(dev))) == NULL)
return ENXIO;
if (uio->uio_offset >= M41T00_NBYTES)
@@ -197,7 +197,7 @@ m41t00_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&m41trtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&m41trtc_cd, minor(dev))) == NULL)
return ENXIO;
if (uio->uio_offset >= M41T00_NBYTES)
diff --git a/sys/dev/i2c/max6900.c b/sys/dev/i2c/max6900.c
index b7a3ceb575c..7eabbaf19c3 100644
--- a/sys/dev/i2c/max6900.c
+++ b/sys/dev/i2c/max6900.c
@@ -1,4 +1,4 @@
-/* $NetBSD: max6900.c,v 1.10 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: max6900.c,v 1.11 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.10 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.11 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ maxrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct maxrtc_softc *sc;
- if ((sc = device_lookup(&maxrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&maxrtc_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -140,7 +140,7 @@ maxrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct maxrtc_softc *sc;
- if ((sc = device_lookup(&maxrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&maxrtc_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -155,7 +155,7 @@ maxrtc_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[1];
int a, error;
- if ((sc = device_lookup(&maxrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&maxrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= MAX6900_RAM_BYTES)
@@ -194,7 +194,7 @@ maxrtc_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[2];
int a, error, sverror;
- if ((sc = device_lookup(&maxrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&maxrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= MAX6900_RAM_BYTES)
diff --git a/sys/dev/i2c/pcf8583.c b/sys/dev/i2c/pcf8583.c
index da3f9893dcc..8b7b1a4b776 100644
--- a/sys/dev/i2c/pcf8583.c
+++ b/sys/dev/i2c/pcf8583.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8583.c,v 1.10 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: pcf8583.c,v 1.11 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8583.c,v 1.10 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8583.c,v 1.11 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ pcfrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct pcfrtc_softc *sc;
- if ((sc = device_lookup(&pcfrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&pcfrtc_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -181,7 +181,7 @@ pcfrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct pcfrtc_softc *sc;
- if ((sc = device_lookup(&pcfrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&pcfrtc_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -196,7 +196,7 @@ pcfrtc_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[1];
int a, error;
- if ((sc = device_lookup(&pcfrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&pcfrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= PCF8583_NVRAM_SIZE)
@@ -235,7 +235,7 @@ pcfrtc_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[2];
int a, error;
- if ((sc = device_lookup(&pcfrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&pcfrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= PCF8583_NVRAM_SIZE)
diff --git a/sys/dev/i2c/x1226.c b/sys/dev/i2c/x1226.c
index 27491b4ab34..5cb50a2f369 100644
--- a/sys/dev/i2c/x1226.c
+++ b/sys/dev/i2c/x1226.c
@@ -1,4 +1,4 @@
-/* $NetBSD: x1226.c,v 1.12 2008/05/04 15:26:29 xtraeme Exp $ */
+/* $NetBSD: x1226.c,v 1.13 2008/06/08 03:49:26 tsutsui Exp $ */
/*
* Copyright (c) 2003 Shigeyuki Fukushima.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.12 2008/05/04 15:26:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.13 2008/06/08 03:49:26 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ xrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xrtc_softc *sc;
- if ((sc = device_lookup(&xrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&xrtc_cd, minor(dev))) == NULL)
return (ENXIO);
/* XXX: Locking */
@@ -146,7 +146,7 @@ xrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xrtc_softc *sc;
- if ((sc = device_lookup(&xrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&xrtc_cd, minor(dev))) == NULL)
return (ENXIO);
sc->sc_open = 0;
@@ -161,7 +161,7 @@ xrtc_read(dev_t dev, struct uio *uio, int flags)
u_int8_t ch, cmdbuf[2];
int addr, error;
- if ((sc = device_lookup(&xrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&xrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= X1226_NVRAM_SIZE)
@@ -202,7 +202,7 @@ xrtc_write(dev_t dev, struct uio *uio, int flags)
u_int8_t cmdbuf[3];
int addr, error;
- if ((sc = device_lookup(&xrtc_cd, minor(dev))) == NULL)
+ if ((sc = device_lookup_private(&xrtc_cd, minor(dev))) == NULL)
return (ENXIO);
if (uio->uio_offset >= X1226_NVRAM_SIZE)