Skip to content

Commit

Permalink
Merge from CheriBSD (2e28d2a)
Browse files Browse the repository at this point in the history
Remove initalized, but unused devname variable

MFC after:	1 week
Sponsored by:	DARPA, AFRL
  • Loading branch information
brooksdavis committed Nov 21, 2014
1 parent dd63bf9 commit 4e73b11
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions sys/dev/altera/avgen/altera_avgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,26 +321,13 @@ altera_avgen_attach(struct altera_avgen_softc *sc, const char *str_fileio,
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,
str_devname, devunit);
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,
Expand Down

0 comments on commit 4e73b11

Please sign in to comment.