From owner-svn-src-all@FreeBSD.ORG Tue Dec 2 21:23:14 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 518DA15A; Tue, 2 Dec 2014 21:23:14 +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 3DC715F3; Tue, 2 Dec 2014 21:23:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2LNE0Y052237; Tue, 2 Dec 2014 21:23:14 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2LNEq7052236; Tue, 2 Dec 2014 21:23:14 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201412022123.sB2LNEq7052236@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Tue, 2 Dec 2014 21:23:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275428 - stable/10/sys/dev/altera/avgen X-SVN-Group: stable-10 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: Tue, 02 Dec 2014 21:23:14 -0000 Author: brooks Date: Tue Dec 2 21:23:13 2014 New Revision: 275428 URL: https://svnweb.freebsd.org/changeset/base/275428 Log: MFC r274820: Merge from CheriBSD (2e28d2a3090239b30481f35dc452ad95a5c57389): Remove initalized, but unused devname variable Sponsored by: DARPA, AFRL Modified: stable/10/sys/dev/altera/avgen/altera_avgen.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/altera/avgen/altera_avgen.c ============================================================================== --- stable/10/sys/dev/altera/avgen/altera_avgen.c Tue Dec 2 20:29:29 2014 (r275427) +++ stable/10/sys/dev/altera/avgen/altera_avgen.c Tue Dec 2 21:23:13 2014 (r275428) @@ -321,7 +321,6 @@ altera_avgen_attach(struct altera_avgen_ const char *str_mmapio, const char *str_devname, int devunit) { device_t dev = sc->avg_dev; - char devname[SPECNAMELEN + 1]; int error; error = altera_avgen_process_options(sc, str_fileio, str_mmapio, @@ -329,18 +328,6 @@ altera_avgen_attach(struct altera_avgen_ if (error) return (error); - /* Select a device name. */ - if (str_devname != NULL) { - if (devunit != -1) - (void)snprintf(devname, sizeof(devname), "%s%d", - str_devname, devunit); - else - (void)snprintf(devname, sizeof(devname), "%s", - str_devname); - } else - snprintf(devname, sizeof(devname), "%s%d", "avgen", - sc->avg_unit); - if (rman_get_size(sc->avg_res) >= PAGE_SIZE || str_mmapio != NULL) { if (rman_get_size(sc->avg_res) % PAGE_SIZE != 0) { device_printf(dev,