diff options
author | ed <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2008-09-27 08:51:18 +0000 |
commit | 4efdef565f9a0ca3468534f97c6ac4aaaf747c9a (patch) | |
tree | dd0035910760a440d495b23940f57a42ed24ca85 /sys/i386/bios | |
parent | d720932e5974ce75bf983cc61010a6eb70f94b86 (diff) | |
download | FreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.zip FreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.tar.gz |
Replace all calls to minor() with dev2unit().
After I removed all the unit2minor()/minor2unit() calls from the kernel
yesterday, I realised calling minor() everywhere is quite confusing.
Character devices now only have the ability to store a unit number, not
a minor number. Remove the confusion by using dev2unit() everywhere.
This commit could also be considered as a bug fix. A lot of drivers call
minor(), while they should actually be calling dev2unit(). In -CURRENT
this isn't a problem, but it turns out we never had any problem reports
related to that issue in the past. I suspect not many people connect
more than 256 pieces of the same hardware.
Reviewed by: kib
Diffstat (limited to 'sys/i386/bios')
-rw-r--r-- | sys/i386/bios/apm.c | 2 | ||||
-rw-r--r-- | sys/i386/bios/smapi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 6120723..2ac82c5 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -78,7 +78,7 @@ int apm_evindex; #define SCFLAG_OCTL 0x0000002 #define SCFLAG_OPEN (SCFLAG_ONORMAL|SCFLAG_OCTL) -#define APMDEV(dev) (minor(dev)&0x0f) +#define APMDEV(dev) (dev2unit(dev)&0x0f) #define APMDEV_NORMAL 0 #define APMDEV_CTL 8 diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c index a97e2a9..bb0b2bf 100644 --- a/sys/i386/bios/smapi.c +++ b/sys/i386/bios/smapi.c @@ -108,7 +108,7 @@ smapi_ioctl (dev, cmd, data, fflag, td) int error; error = 0; - sc = devclass_get_softc(smapi_devclass, minor(dev)); + sc = devclass_get_softc(smapi_devclass, dev2unit(dev)); if (sc == NULL) { error = ENXIO; goto fail; |