summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2008-06-08 18:14:31 +0000
committertsutsui <tsutsui@NetBSD.org>2008-06-08 18:14:31 +0000
commitc9a8620b99e07b2fd1817090c76f836642bee7ec (patch)
treec72e2d097cbea9d4a81e3172cae89ccf26600f5c /sys/dev
parentfefb677d2172dcfd9162cd3b91b12da4937537af (diff)
Replace homegrown pad_find_softc() with device_lookup_private().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pad/pad.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/sys/dev/pad/pad.c b/sys/dev/pad/pad.c
index 71121126fc3..24346eba728 100644
--- a/sys/dev/pad/pad.c
+++ b/sys/dev/pad/pad.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.7 2008/05/09 03:44:51 jmcneill Exp $ */
+/* $NetBSD: pad.c,v 1.8 2008/06/08 18:14:31 tsutsui Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.7 2008/05/09 03:44:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.8 2008/06/08 18:14:31 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -117,7 +117,6 @@ static const struct audio_format pad_formats[PAD_NFORMATS] = {
extern void padattach(int);
-static pad_softc_t * pad_find_softc(dev_t);
static int pad_add_block(pad_softc_t *, uint8_t *, int);
static int pad_get_block(pad_softc_t *, pad_block_t *, int);
@@ -178,18 +177,6 @@ padattach(int n)
return;
}
-static pad_softc_t *
-pad_find_softc(dev_t dev)
-{
- int unit;
-
- unit = PADUNIT(dev);
- if (unit >= pad_cd.cd_ndevs)
- return NULL;
-
- return pad_cd.cd_devs[unit];
-}
-
static int
pad_add_block(pad_softc_t *sc, uint8_t *blk, int blksize)
{
@@ -310,7 +297,7 @@ pad_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
pad_softc_t *sc;
- sc = pad_find_softc(dev);
+ sc = device_lookup_private(&pad_cd, PADUNIT(dev));
if (sc == NULL)
return ENODEV;
@@ -327,7 +314,7 @@ pad_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
pad_softc_t *sc;
- sc = pad_find_softc(dev);
+ sc = device_lookup_private(&pad_cd, PADUNIT(dev));
if (sc == NULL)
return ENODEV;
@@ -346,7 +333,7 @@ pad_read(dev_t dev, struct uio *uio, int flags)
void *intrarg;
int err;
- sc = pad_find_softc(dev);
+ sc = device_lookup_private(&pad_cd, PADUNIT(dev));
if (sc == NULL)
return ENODEV;