svn commit: r299095 - head/sys/kern

Adrian Chadd adrian at FreeBSD.org
Wed May 4 23:31:54 UTC 2016


Author: adrian
Date: Wed May  4 23:31:52 2016
New Revision: 299095
URL: https://svnweb.freebsd.org/changeset/base/299095

Log:
  s/struct device */device_t/g
  
  Submitted by:	kmacy

Modified:
  head/sys/kern/subr_bus.c
  head/sys/kern/subr_rman.c

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Wed May  4 23:20:53 2016	(r299094)
+++ head/sys/kern/subr_bus.c	Wed May  4 23:31:52 2016	(r299095)
@@ -5186,7 +5186,7 @@ find_device(struct devreq *req, device_t
 }
 
 static bool
-driver_exists(struct device *bus, const char *driver)
+driver_exists(device_t bus, const char *driver)
 {
 	devclass_t dc;
 

Modified: head/sys/kern/subr_rman.c
==============================================================================
--- head/sys/kern/subr_rman.c	Wed May  4 23:20:53 2016	(r299094)
+++ head/sys/kern/subr_rman.c	Wed May  4 23:31:52 2016	(r299095)
@@ -94,7 +94,7 @@ struct resource_i {
 	rman_res_t	r_end;		/* index of the last entry (inclusive) */
 	u_int	r_flags;
 	void	*r_virtual;	/* virtual address of this resource */
-	struct device *r_dev;	/* device which has allocated this resource */
+	device_t r_dev;	/* device which has allocated this resource */
 	struct rman *r_rm;	/* resource manager from whence this came */
 	int	r_rid;		/* optional rid for this resource. */
 };
@@ -436,7 +436,7 @@ rman_adjust_resource(struct resource *rr
 struct resource *
 rman_reserve_resource_bound(struct rman *rm, rman_res_t start, rman_res_t end,
 			    rman_res_t count, rman_res_t bound, u_int flags,
-			    struct device *dev)
+			    device_t dev)
 {
 	u_int new_rflags;
 	struct resource_i *r, *s, *rv;
@@ -652,7 +652,7 @@ out:
 
 struct resource *
 rman_reserve_resource(struct rman *rm, rman_res_t start, rman_res_t end,
-		      rman_res_t count, u_int flags, struct device *dev)
+		      rman_res_t count, u_int flags, device_t dev)
 {
 
 	return (rman_reserve_resource_bound(rm, start, end, count, 0, flags,
@@ -911,13 +911,13 @@ rman_get_rid(struct resource *r)
 }
 
 void
-rman_set_device(struct resource *r, struct device *dev)
+rman_set_device(struct resource *r, device_t dev)
 {
 
 	r->__r_i->r_dev = dev;
 }
 
-struct device *
+device_t
 rman_get_device(struct resource *r)
 {
 


More information about the svn-src-head mailing list