summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2008-09-27 08:51:18 +0000
committered <ed@FreeBSD.org>2008-09-27 08:51:18 +0000
commit4efdef565f9a0ca3468534f97c6ac4aaaf747c9a (patch)
treedd0035910760a440d495b23940f57a42ed24ca85 /sys/dev/drm
parentd720932e5974ce75bf983cc61010a6eb70f94b86 (diff)
downloadFreeBSD-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/drm')
-rw-r--r--sys/dev/drm/drm_drv.c2
-rw-r--r--sys/dev/drm/drm_fops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c
index 7ed2393..b41b53d 100644
--- a/sys/dev/drm/drm_drv.c
+++ b/sys/dev/drm/drm_drv.c
@@ -713,7 +713,7 @@ int drm_open(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
struct drm_device *dev = NULL;
int retcode = 0;
- dev = DRIVER_SOFTC(minor(kdev));
+ dev = DRIVER_SOFTC(dev2unit(kdev));
DRM_DEBUG( "open_count = %d\n", dev->open_count );
diff --git a/sys/dev/drm/drm_fops.c b/sys/dev/drm/drm_fops.c
index 23cc1c0..f6eacd2 100644
--- a/sys/dev/drm/drm_fops.c
+++ b/sys/dev/drm/drm_fops.c
@@ -62,7 +62,7 @@ drm_file_t *drm_find_file_by_proc(struct drm_device *dev, DRM_STRUCTPROC *p)
int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p,
struct drm_device *dev)
{
- int m = minor(kdev);
+ int m = dev2unit(kdev);
drm_file_t *priv;
int retcode;
OpenPOWER on IntegriCloud