Date: Fri, 21 Nov 2014 21:10:03 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274820 - head/sys/dev/altera/avgen Message-ID: <201411212110.sALLA3Cr043274@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Nov 21 21:10:02 2014 New Revision: 274820 URL: https://svnweb.freebsd.org/changeset/base/274820 Log: Merge from CheriBSD (2e28d2a3090239b30481f35dc452ad95a5c57389) Remove initalized, but unused devname variable MFC after: 1 week Sponsored by: DARPA, AFRL Modified: head/sys/dev/altera/avgen/altera_avgen.c Modified: head/sys/dev/altera/avgen/altera_avgen.c ============================================================================== --- head/sys/dev/altera/avgen/altera_avgen.c Fri Nov 21 21:01:24 2014 (r274819) +++ head/sys/dev/altera/avgen/altera_avgen.c Fri Nov 21 21:10:02 2014 (r274820) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411212110.sALLA3Cr043274>