D50939.id157943.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50939.id157943.diff
View Options

	diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
	--- a/sys/dev/gpio/gpiobus.c
	+++ b/sys/dev/gpio/gpiobus.c
	@@ -399,7 +399,7 @@
	}

	/* Release mapped pin */
	-int
	+void
	gpiobus_release_pin(device_t bus, uint32_t pin)
	{
	struct gpiobus_softc *sc;
	@@ -407,19 +407,15 @@
	sc = device_get_softc(bus);
	/* Consistency check. */
	if (pin >= sc->sc_npins) {
	- device_printf(bus,
	- "invalid pin %d, max=%d\n",
	- pin, sc->sc_npins - 1);
	- return (-1);
	+ panic("%s: invalid pin %d, max: %d",
	+ device_get_nameunit(bus), pin, sc->sc_npins - 1);
	}

	- if (!sc->sc_pins[pin].mapped) {
	- device_printf(bus, "pin %d is not mapped\n", pin);
	- return (-1);
	- }
	- sc->sc_pins[pin].mapped = 0;
	+ if (!sc->sc_pins[pin].mapped)
	+ panic("%s: pin %d is not mapped", device_get_nameunit(bus),
	+ pin);

	- return (0);
	+ sc->sc_pins[pin].mapped = 0;
	}

	static int
	@@ -434,8 +430,7 @@
	device_printf(child, "cannot acquire pin %d\n",
	devi->pins[i]);
	while (--i >= 0) {
	- (void)gpiobus_release_pin(dev,
	- devi->pins[i]);
	+ gpiobus_release_pin(dev, devi->pins[i]);
	}
	gpiobus_free_ivars(devi);
	return (EBUSY);
	diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
	--- a/sys/dev/gpio/gpiobusvar.h
	+++ b/sys/dev/gpio/gpiobusvar.h
	@@ -181,7 +181,7 @@
	void gpiobus_free_ivars(struct gpiobus_ivar *);
	int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *);
	int gpiobus_acquire_pin(device_t, uint32_t);
	-int gpiobus_release_pin(device_t, uint32_t);
	+void gpiobus_release_pin(device_t, uint32_t);

	extern driver_t gpiobus_driver;