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/ia64 | |
| 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/ia64')
| -rw-r--r-- | sys/ia64/ia64/mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c index 6c5cbe7..ab213d7 100644 --- a/sys/ia64/ia64/mem.c +++ b/sys/ia64/ia64/mem.c @@ -94,7 +94,7 @@ memrw(struct cdev *dev, struct uio *uio, int flags) continue; } - if (minor(dev) == CDEV_MINOR_MEM) { + if (dev2unit(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: /* Allow reads only in RAM. */ @@ -111,7 +111,7 @@ kmemphys: error = uiomove((caddr_t)IA64_PHYS_TO_RR7(v), c, uio); continue; } - else if (minor(dev) == CDEV_MINOR_KMEM) { + else if (dev2unit(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= IA64_RR_BASE(6)) { @@ -156,7 +156,7 @@ memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) * could be transient and hence incorrect or invalid at * a later time. */ - if (minor(dev) != CDEV_MINOR_MEM) + if (dev2unit(dev) != CDEV_MINOR_MEM) return (-1); /* |
