svn commit: r286909 - head/sys/dev/gpio

Luiz Otavio O Souza loos at FreeBSD.org
Tue Aug 18 21:37:15 UTC 2015


Author: loos
Date: Tue Aug 18 21:37:14 2015
New Revision: 286909
URL: https://svnweb.freebsd.org/changeset/base/286909

Log:
  Fix the use of plural in two cases that I missed on r285784.
  
  This should cause no functional change.

Modified:
  head/sys/dev/gpio/gpiobus.c

Modified: head/sys/dev/gpio/gpiobus.c
==============================================================================
--- head/sys/dev/gpio/gpiobus.c	Tue Aug 18 21:05:56 2015	(r286908)
+++ head/sys/dev/gpio/gpiobus.c	Tue Aug 18 21:37:14 2015	(r286909)
@@ -386,7 +386,10 @@ gpiobus_probe_nomatch(device_t dev, devi
 	devi = GPIOBUS_IVAR(child);
 	memset(pins, 0, sizeof(pins));
 	gpiobus_print_pins(devi, pins, sizeof(pins));
-	device_printf(dev, "<unknown device> at pin(s) %s", pins);
+	if (devi->npins > 1)
+		device_printf(dev, "<unknown device> at pins %s", pins);
+	else
+		device_printf(dev, "<unknown device> at pin %s", pins);
 	resource_list_print_type(&devi->rl, "irq", SYS_RES_IRQ, "%ld");
 	printf("\n");
 }
@@ -422,7 +425,10 @@ gpiobus_child_location_str(device_t bus,
 	struct gpiobus_ivar *devi;
 
 	devi = GPIOBUS_IVAR(child);
-	strlcpy(buf, "pin(s)=", buflen);
+	if (devi->npins > 1)
+		strlcpy(buf, "pins=", buflen);
+	else
+		strlcpy(buf, "pin=", buflen);
 	gpiobus_print_pins(devi, buf, buflen);
 
 	return (0);


More information about the svn-src-all mailing list