From owner-svn-src-head@freebsd.org Wed May 4 23:31:53 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E843AB2D7C5; Wed, 4 May 2016 23:31:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A001B1D02; Wed, 4 May 2016 23:31:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u44NVqoI070254; Wed, 4 May 2016 23:31:52 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u44NVqmm070252; Wed, 4 May 2016 23:31:52 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605042331.u44NVqmm070252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 4 May 2016 23:31:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299095 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2016 23:31:54 -0000 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) {