From owner-svn-src-head@FreeBSD.ORG  Thu Jun 17 08:49:31 2010
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 B95211065674;
	Thu, 17 Jun 2010 08:49:31 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8D158FC24;
	Thu, 17 Jun 2010 08:49:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5H8nVGV071594;
	Thu, 17 Jun 2010 08:49:31 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5H8nV3h071591;
	Thu, 17 Jun 2010 08:49:31 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201006170849.o5H8nV3h071591@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 17 Jun 2010 08:49:31 +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: r209244 - in head/sys: kern sys
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, 17 Jun 2010 08:49:31 -0000

Author: ed
Date: Thu Jun 17 08:49:31 2010
New Revision: 209244
URL: http://svn.freebsd.org/changeset/base/209244

Log:
  Remove the unit argument from the recently added make_dev_p().
  
  New code that creates character devices shouldn't use device unit
  numbers, but only si_drv[12] to hold pointer to per-device data. Make
  this function more future proof by removing the unit number argument.
  
  Discussed with:	kib

Modified:
  head/sys/kern/kern_conf.c
  head/sys/sys/conf.h

Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c	Thu Jun 17 05:03:01 2010	(r209243)
+++ head/sys/kern/kern_conf.c	Thu Jun 17 08:49:31 2010	(r209244)
@@ -766,14 +766,14 @@ make_dev_credf(int flags, struct cdevsw 
 }
 
 int
-make_dev_p(int flags, struct cdev **cdev, struct cdevsw *devsw, int unit,
+make_dev_p(int flags, struct cdev **cdev, struct cdevsw *devsw,
     struct ucred *cr, uid_t uid, gid_t gid, int mode, const char *fmt, ...)
 {
 	va_list ap;
 	int res;
 
 	va_start(ap, fmt);
-	res = make_dev_credv(flags, cdev, devsw, unit, cr, uid, gid, mode,
+	res = make_dev_credv(flags, cdev, devsw, 0, cr, uid, gid, mode,
 	    fmt, ap);
 	va_end(ap);
 

Modified: head/sys/sys/conf.h
==============================================================================
--- head/sys/sys/conf.h	Thu Jun 17 05:03:01 2010	(r209243)
+++ head/sys/sys/conf.h	Thu Jun 17 08:49:31 2010	(r209244)
@@ -271,8 +271,8 @@ struct cdev *make_dev_credf(int _flags,
 		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
 		const char *_fmt, ...) __printflike(8, 9);
 int	make_dev_p(int _flags, struct cdev **_cdev, struct cdevsw *_devsw,
-		int _unit, struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
-		const char *_fmt, ...) __printflike(9, 10);
+		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
+		const char *_fmt, ...) __printflike(8, 9);
 struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
 		__printflike(2, 3);
 void	dev_lock(void);