D51133.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51133.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
	@@ -293,7 +293,7 @@
	}

	device_t
	-gpiobus_attach_bus(device_t dev)
	+gpiobus_add_bus(device_t dev)
	{
	device_t busdev;

	@@ -307,8 +307,24 @@
	#ifdef FDT
	ofw_gpiobus_register_provider(dev);
	#endif
	- bus_attach_children(dev);
	+ return (busdev);
	+}

	+/*
	+ * Attach a gpiobus child.
	+ * Note that the controller is expected
	+ * to be fully initialized at this point.
	+ */
	+device_t
	+gpiobus_attach_bus(device_t dev)
	+{
	+ device_t busdev;
	+
	+ busdev = gpiobus_add_bus(dev);
	+ if (busdev == NULL)
	+ return (NULL);
	+
	+ bus_attach_children(dev);
	return (busdev);
	}

	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
	@@ -172,6 +172,7 @@
	* these should not be called directly by other drivers.
	*/
	int gpio_check_flags(uint32_t, uint32_t);
	+device_t gpiobus_add_bus(device_t);
	device_t gpiobus_attach_bus(device_t);
	int gpiobus_detach_bus(device_t);
	int gpiobus_attach(device_t);