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/dev/speaker | |
| 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/dev/speaker')
| -rw-r--r-- | sys/dev/speaker/spkr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 44b825f..8d2ceed 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -419,7 +419,7 @@ spkropen(dev, flags, fmt, td) (void) printf("spkropen: entering with dev = %s\n", devtoname(dev)); #endif /* DEBUG */ - if (minor(dev) != 0) + if (dev2unit(dev) != 0) return(ENXIO); else if (spkr_active) return(EBUSY); @@ -444,7 +444,7 @@ spkrwrite(dev, uio, ioflag) printf("spkrwrite: entering with dev = %s, count = %d\n", devtoname(dev), uio->uio_resid); #endif /* DEBUG */ - if (minor(dev) != 0) + if (dev2unit(dev) != 0) return(ENXIO); else if (uio->uio_resid > (DEV_BSIZE - 1)) /* prevent system crashes */ return(E2BIG); @@ -475,7 +475,7 @@ spkrclose(dev, flags, fmt, td) (void) printf("spkrclose: entering with dev = %s\n", devtoname(dev)); #endif /* DEBUG */ - if (minor(dev) != 0) + if (dev2unit(dev) != 0) return(ENXIO); else { wakeup(&endtone); @@ -499,7 +499,7 @@ spkrioctl(dev, cmd, cmdarg, flags, td) devtoname(dev), cmd); #endif /* DEBUG */ - if (minor(dev) != 0) + if (dev2unit(dev) != 0) return(ENXIO); else if (cmd == SPKRTONE) { tone_t *tp = (tone_t *)cmdarg; |
