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/ppbus/pcfclock.c | |
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/ppbus/pcfclock.c')
-rw-r--r-- | sys/dev/ppbus/pcfclock.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c index 0a65055..c7562fc 100644 --- a/sys/dev/ppbus/pcfclock.c +++ b/sys/dev/ppbus/pcfclock.c @@ -153,7 +153,7 @@ pcfclock_attach(device_t dev) static int pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct pcfclock_data *sc = UNITOSOFTC(unit); device_t pcfclockdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(pcfclockdev); @@ -174,7 +174,7 @@ pcfclock_open(struct cdev *dev, int flag, int fms, struct thread *td) static int pcfclock_close(struct cdev *dev, int flags, int fmt, struct thread *td) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); struct pcfclock_data *sc = UNITOSOFTC(unit); device_t pcfclockdev = UNITODEVICE(unit); device_t ppbus = device_get_parent(pcfclockdev); @@ -189,7 +189,7 @@ pcfclock_close(struct cdev *dev, int flags, int fmt, struct thread *td) static void pcfclock_write_cmd(struct cdev *dev, unsigned char command) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); unsigned char ctr = 14; @@ -209,7 +209,7 @@ pcfclock_write_cmd(struct cdev *dev, unsigned char command) static void pcfclock_display_data(struct cdev *dev, char buf[18]) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); #ifdef PCFCLOCK_VERBOSE int year; @@ -233,7 +233,7 @@ pcfclock_display_data(struct cdev *dev, char buf[18]) static int pcfclock_read_data(struct cdev *dev, char *buf, ssize_t bits) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); int i; @@ -272,7 +272,7 @@ pcfclock_read_data(struct cdev *dev, char *buf, ssize_t bits) static int pcfclock_read_dev(struct cdev *dev, char *buf, int maxretries) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); device_t ppidev = UNITODEVICE(unit); device_t ppbus = device_get_parent(ppidev); int error = 0; @@ -302,7 +302,7 @@ pcfclock_read_dev(struct cdev *dev, char *buf, int maxretries) static int pcfclock_read(struct cdev *dev, struct uio *uio, int ioflag) { - u_int unit = minor(dev); + u_int unit = dev2unit(dev); char buf[18]; int error = 0; |