summaryrefslogtreecommitdiff
path: root/sys/dev/sun
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2006-03-28 17:38:24 +0000
committerthorpej <thorpej@NetBSD.org>2006-03-28 17:38:24 +0000
commit39cd836ee121586d7aeef7facf29276e7a66a7fb (patch)
treed6ca200abe74ecb5d379f372d93e5201b2677f51 /sys/dev/sun
parentd717ea85c2362092cc30ae655b160d0c9cf47294 (diff)
Use device_unit().
Diffstat (limited to 'sys/dev/sun')
-rw-r--r--sys/dev/sun/fb.c16
-rw-r--r--sys/dev/sun/ms_zs.c6
-rw-r--r--sys/dev/sun/sunms.c6
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index 39ddff49c8a..301ea5459a9 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: fb.c,v 1.24 2006/03/28 17:38:35 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.24 2006/03/28 17:38:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -221,7 +221,7 @@ fbopen(dev, flags, mode, l)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
return (fbl->fb_dev->fb_driver->fbd_open)(makedev(0, nunit), flags,
mode, l);
}
@@ -241,7 +241,7 @@ fbclose(dev, flags, mode, l)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
return (fbl->fb_dev->fb_driver->fbd_close)(makedev(0, nunit), flags,
mode, l);
}
@@ -263,7 +263,7 @@ fbioctl(dev, cmd, data, flags, l)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
return (fbl->fb_dev->fb_driver->fbd_ioctl)(makedev(0, nunit), cmd,
data, flags, l);
}
@@ -283,7 +283,7 @@ fbpoll(dev, events, l)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
return (fbl->fb_dev->fb_driver->fbd_poll)(makedev(0, nunit), events,
l);
}
@@ -302,7 +302,7 @@ fbkqfilter(dev, kn)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
return (fbl->fb_dev->fb_driver->fbd_kqfilter)(makedev(0, nunit), kn);
}
@@ -321,7 +321,7 @@ fbmmap(dev, off, prot)
if (fbl == NULL || fbl->fb_dev == NULL)
return (ENXIO);
- nunit = fbl->fb_dev->fb_device->dv_unit;
+ nunit = device_unit(fbl->fb_dev->fb_device);
paddr_t (*map)(dev_t, off_t, int) = fbl->fb_dev->fb_driver->fbd_mmap;
if (map == NULL)
diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c
index 5ddc0e16f4c..1c6fdcac46b 100644
--- a/sys/dev/sun/ms_zs.c
+++ b/sys/dev/sun/ms_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: ms_zs.c,v 1.14 2006/03/28 17:38:35 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.14 2006/03/28 17:38:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,7 +136,7 @@ ms_zs_attach(parent, self, aux)
int bps;
cf = ms->ms_dev.dv_cfdata;
- ms_unit = ms->ms_dev.dv_unit;
+ ms_unit = device_unit(&ms->ms_dev);
channel = args->channel;
cs = zsc->zsc_cs[channel];
cs->cs_private = ms;
diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c
index c9160b2264e..53e2534fa1d 100644
--- a/sys/dev/sun/sunms.c
+++ b/sys/dev/sun/sunms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $ */
+/* $NetBSD: sunms.c,v 1.22 2006/03/28 17:38:35 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.22 2006/03/28 17:38:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@ sunms_attach(parent, self, aux)
#endif
cf = ms->ms_dev.dv_cfdata;
- ms_unit = ms->ms_dev.dv_unit;
+ ms_unit = device_unit(&ms->ms_dev);
tp->t_sc = ms;
tp->t_dev = args->kmta_dev;
ms->ms_cs = (struct zs_chanstate *)tp;