From 4efdef565f9a0ca3468534f97c6ac4aaaf747c9a Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 27 Sep 2008 08:51:18 +0000 Subject: 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 --- sys/dev/ce/if_ce.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/ce/if_ce.c') diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index a08a7a0..9b0d69c 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -1254,7 +1254,7 @@ static int ce_open (dev_t dev, int oflags, int devtype, struct proc *p) static int ce_open (struct cdev *dev, int oflags, int devtype, struct thread *td) #endif { - int unit = minor (dev); + int unit = dev2unit (dev); drv_t *d; if (unit >= NBRD*NCHAN || ! (d = channel[unit])) @@ -1272,7 +1272,7 @@ static int ce_close (dev_t dev, int fflag, int devtype, struct proc *p) static int ce_close (struct cdev *dev, int fflag, int devtype, struct thread *td) #endif { - drv_t *d = channel [minor (dev)]; + drv_t *d = channel [dev2unit (dev)]; CE_DEBUG2 (d, ("ce_close\n")); return 0; @@ -1303,7 +1303,7 @@ static int ce_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc static int ce_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) #endif { - drv_t *d = channel [minor (dev)]; + drv_t *d = channel [dev2unit (dev)]; bdrv_t *bd = d->board->sys; ce_chan_t *c = d->chan; struct serial_statistics *st; -- cgit v1.1