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/iir | |
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/iir')
-rw-r--r-- | sys/dev/iir/iir_ctrl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c index 206b6ff..e5fbac94 100644 --- a/sys/dev/iir/iir_ctrl.c +++ b/sys/dev/iir/iir_ctrl.c @@ -152,7 +152,7 @@ iir_open(struct cdev *dev, int flags, int fmt, d_thread_t * p) int minor_no; struct gdt_softc *gdt; - minor_no = minor(dev); + minor_no = dev2unit(dev); gdt = gdt_minor2softc(minor_no); if (gdt == NULL) return (ENXIO); @@ -170,7 +170,7 @@ iir_close(struct cdev *dev, int flags, int fmt, d_thread_t * p) int minor_no; struct gdt_softc *gdt; - minor_no = minor(dev); + minor_no = dev2unit(dev); gdt = gdt_minor2softc(minor_no); if (gdt == NULL) return (ENXIO); @@ -188,7 +188,7 @@ iir_write(struct cdev *dev, struct uio * uio, int ioflag) int minor_no; struct gdt_softc *gdt; - minor_no = minor(dev); + minor_no = dev2unit(dev); gdt = gdt_minor2softc(minor_no); if (gdt == NULL) return (ENXIO); @@ -206,7 +206,7 @@ iir_read(struct cdev *dev, struct uio * uio, int ioflag) int minor_no; struct gdt_softc *gdt; - minor_no = minor(dev); + minor_no = dev2unit(dev); gdt = gdt_minor2softc(minor_no); if (gdt == NULL) return (ENXIO); @@ -230,7 +230,7 @@ iir_ioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, d_thread_t * int minor_no; struct gdt_softc *gdt; - minor_no = minor(dev); + minor_no = dev2unit(dev); gdt = gdt_minor2softc(minor_no); if (gdt == NULL) return (ENXIO); |