From owner-svn-src-all@FreeBSD.ORG Wed Dec 3 15:29:54 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F1E0A08; Wed, 3 Dec 2014 15:29:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 61A9A9AF; Wed, 3 Dec 2014 15:29:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB3FTsHc051238; Wed, 3 Dec 2014 15:29:54 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB3FTrwv051236; Wed, 3 Dec 2014 15:29:53 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201412031529.sB3FTrwv051236@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Dec 2014 15:29:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275460 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2014 15:29:54 -0000 Author: jhb Date: Wed Dec 3 15:29:53 2014 New Revision: 275460 URL: https://svnweb.freebsd.org/changeset/base/275460 Log: Revert device_getenv_int() for now as it duplicates resource_int_value(). We should perhaps implement a device_getenv_*() and device_setenv_*() API as a convenience wrapper on top of resource_*_value() and resource_set_*(). Modified: head/sys/kern/subr_bus.c head/sys/sys/bus.h Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Wed Dec 3 15:19:38 2014 (r275459) +++ head/sys/kern/subr_bus.c Wed Dec 3 15:29:53 2014 (r275460) @@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include @@ -5033,18 +5031,3 @@ bus_free_resource(device_t dev, int type return (0); return (bus_release_resource(dev, type, rman_get_rid(r), r)); } - -int -device_getenv_int(device_t dev, const char *knob, int *iptr) -{ - char env[128]; - int sz; - - sz = snprintf(env, sizeof(env), "hw.%s.%d.%s", device_get_name(dev), device_get_unit(dev), knob); - if (sz >= sizeof(env)) { - /* XXX: log? return error? bump sysctl error? */ - log(LOG_ERR, "device_getenv_int: knob too long: '%s'", knob); - return 0; - } - return (getenv_int(env, iptr)); -} Modified: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Wed Dec 3 15:19:38 2014 (r275459) +++ head/sys/sys/bus.h Wed Dec 3 15:29:53 2014 (r275460) @@ -449,7 +449,6 @@ const char *device_get_nameunit(device_t void *device_get_softc(device_t dev); device_state_t device_get_state(device_t dev); int device_get_unit(device_t dev); -int device_getenv_int(device_t dev, const char *knob, int *iptr); struct sysctl_ctx_list *device_get_sysctl_ctx(device_t dev); struct sysctl_oid *device_get_sysctl_tree(device_t dev); int device_is_alive(device_t dev); /* did probe succeed? */