From owner-svn-src-head@FreeBSD.ORG  Thu Oct 23 20:23:03 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D443B1065670;
	Thu, 23 Oct 2008 20:23:03 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B08058FC1A;
	Thu, 23 Oct 2008 20:23:03 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9NKN3GZ066056;
	Thu, 23 Oct 2008 20:23:03 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9NKN3g8066054;
	Thu, 23 Oct 2008 20:23:03 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200810232023.m9NKN3g8066054@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Thu, 23 Oct 2008 20:23:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184213 - head/sys/dev/drm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Oct 2008 20:23:04 -0000

Author: rnoland
Date: Thu Oct 23 20:23:03 2008
New Revision: 184213
URL: http://svn.freebsd.org/changeset/base/184213

Log:
  Replace calls to minor() with dev2unit().  Ed already fixed this once,
  but I inadvertently overwrote the change when I synced to git.  Commit
  the fix in both places, so this doesn't happen again.
  
  Approved by:	jhb (mentor)
  MFC after:	2 weeks

Modified:
  head/sys/dev/drm/drm_drv.c
  head/sys/dev/drm/drm_fops.c

Modified: head/sys/dev/drm/drm_drv.c
==============================================================================
--- head/sys/dev/drm/drm_drv.c	Thu Oct 23 20:19:56 2008	(r184212)
+++ head/sys/dev/drm/drm_drv.c	Thu Oct 23 20:23:03 2008	(r184213)
@@ -537,7 +537,7 @@ int drm_open(struct cdev *kdev, int flag
 	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);
 

Modified: head/sys/dev/drm/drm_fops.c
==============================================================================
--- head/sys/dev/drm/drm_fops.c	Thu Oct 23 20:19:56 2008	(r184212)
+++ head/sys/dev/drm/drm_fops.c	Thu Oct 23 20:23:03 2008	(r184213)
@@ -44,7 +44,7 @@ int drm_open_helper(struct cdev *kdev, i
 		    struct drm_device *dev)
 {
 	struct drm_file *priv;
-	int m = minor(kdev);
+	int m = dev2unit(kdev);
 	int retcode;
 
 	if (flags & O_EXCL)