D51578.id160023.diff
No OneTemporary
Actions

Size

15 KB

Referenced Files

None

Subscribers

None

D51578.id160023.diff
View Options

	diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c
	--- a/sys/arm/allwinner/aw_gpio.c
	+++ b/sys/arm/allwinner/aw_gpio.c
	@@ -1162,8 +1162,8 @@
	fdt_pinctrl_register(dev, "allwinner,pins");
	fdt_pinctrl_configure_tree(dev);

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL)
	+ err = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (err != 0)
	goto fail;

	config_intrhook_oneshot(aw_gpio_enable_bank_supply, sc);
	diff --git a/sys/arm/allwinner/axp209.c b/sys/arm/allwinner/axp209.c
	--- a/sys/arm/allwinner/axp209.c
	+++ b/sys/arm/allwinner/axp209.c
	@@ -1322,7 +1322,7 @@
	case AXP209:
	sc->pins = axp209_pins;
	sc->npins = nitems(axp209_pins);
	- sc->gpiodev = gpiobus_attach_bus(dev);
	+ gpiobus_attach_bus(dev, &sc->gpiodev);

	sc->sensors = axp209_sensors;
	sc->nsensors = nitems(axp209_sensors);
	@@ -1333,7 +1333,7 @@
	case AXP221:
	sc->pins = axp221_pins;
	sc->npins = nitems(axp221_pins);
	- sc->gpiodev = gpiobus_attach_bus(dev);
	+ gpiobus_attach_bus(dev, &sc->gpiodev);

	sc->sensors = axp221_sensors;
	sc->nsensors = nitems(axp221_sensors);
	diff --git a/sys/arm/allwinner/axp81x.c b/sys/arm/allwinner/axp81x.c
	--- a/sys/arm/allwinner/axp81x.c
	+++ b/sys/arm/allwinner/axp81x.c
	@@ -1609,7 +1609,7 @@
	EVENTHANDLER_REGISTER(shutdown_final, axp8xx_shutdown, dev,
	SHUTDOWN_PRI_LAST);

	- sc->gpiodev = gpiobus_attach_bus(dev);
	+ gpiobus_attach_bus(dev, &sc->gpiodev);

	return (0);
	}
	diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
	--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
	+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
	@@ -840,8 +840,7 @@

	fdt_pinctrl_register(dev, "brcm,pins");
	fdt_pinctrl_configure_tree(dev);
	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL)
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev))
	goto fail;

	return (0);
	diff --git a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
	--- a/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
	+++ b/sys/arm/broadcom/bcm2835/raspberrypi_gpio.c
	@@ -404,8 +404,8 @@
	}
	}
	free(names, M_OFWPROP);
	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL)
	+ rv = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (rv != 0)
	goto fail;

	return (0);
	diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
	--- a/sys/arm/freescale/imx/imx_gpio.c
	+++ b/sys/arm/freescale/imx/imx_gpio.c
	@@ -861,9 +861,7 @@
	gpio_pic_register_isrcs(sc);
	intr_pic_register(dev, OF_xref_from_node(ofw_bus_get_node(dev)));
	#endif
	- sc->sc_busdev = gpiobus_attach_bus(dev);
	-
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev)) {
	imx51_gpio_detach(dev);
	return (ENXIO);
	}
	diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
	--- a/sys/arm/freescale/vybrid/vf_gpio.c
	+++ b/sys/arm/freescale/vybrid/vf_gpio.c
	@@ -147,8 +147,7 @@
	"vf_gpio%d.%d", device_get_unit(dev), i);
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev)) {
	bus_release_resources(dev, vf_gpio_spec, sc->res);
	mtx_destroy(&sc->sc_mtx);
	return (ENXIO);
	diff --git a/sys/arm/mv/a37x0_gpio.c b/sys/arm/mv/a37x0_gpio.c
	--- a/sys/arm/mv/a37x0_gpio.c
	+++ b/sys/arm/mv/a37x0_gpio.c
	@@ -291,8 +291,8 @@
	if (sc->sc_npins > sc->sc_max_pins)
	return (ENXIO);

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL)
	+ err = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (err != 0)
	return (ENXIO);

	return (0);
	diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
	--- a/sys/arm/mv/gpio.c
	+++ b/sys/arm/mv/gpio.c
	@@ -340,8 +340,8 @@
	if (rv != 0)
	return (rv);

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ rv = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (rv != 0) {
	mtx_destroy(&sc->mutex);
	bus_release_resource(dev, SYS_RES_IRQ,
	sc->irq_rid[i], sc->irq_res[i]);
	diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c
	--- a/sys/arm/mv/mvebu_gpio.c
	+++ b/sys/arm/mv/mvebu_gpio.c
	@@ -804,8 +804,8 @@
	}
	}

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ rv = gpiobus_attach_bus(dev, &sc->busdev);
	+ if (rv != 0) {
	mvebu_gpio_detach(dev);
	return (ENXIO);
	}
	diff --git a/sys/arm/nvidia/tegra_gpio.c b/sys/arm/nvidia/tegra_gpio.c
	--- a/sys/arm/nvidia/tegra_gpio.c
	+++ b/sys/arm/nvidia/tegra_gpio.c
	@@ -818,8 +818,7 @@
	return (ENXIO);
	}

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	tegra_gpio_detach(dev);
	return (ENXIO);
	}
	diff --git a/sys/arm/ti/ti_gpio.c b/sys/arm/ti/ti_gpio.c
	--- a/sys/arm/ti/ti_gpio.c
	+++ b/sys/arm/ti/ti_gpio.c
	@@ -674,8 +674,8 @@
	}
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ err = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (err != 0) {
	ti_gpio_detach(dev);
	return (ENXIO);
	}
	diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c
	--- a/sys/arm/xilinx/zy7_gpio.c
	+++ b/sys/arm/xilinx/zy7_gpio.c
	@@ -441,8 +441,7 @@
	return (ENOMEM);
	}

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	zy7_gpio_detach(dev);
	return (ENOMEM);
	}
	diff --git a/sys/arm64/apple/apple_pinctrl.c b/sys/arm64/apple/apple_pinctrl.c
	--- a/sys/arm64/apple/apple_pinctrl.c
	+++ b/sys/arm64/apple/apple_pinctrl.c
	@@ -171,8 +171,8 @@
	OF_xref_from_node(ofw_bus_get_node(dev)));
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ error = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (error != 0) {
	device_printf(dev, "failed to attach gpiobus\n");
	goto error;
	}
	diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c
	--- a/sys/arm64/rockchip/rk_gpio.c
	+++ b/sys/arm64/rockchip/rk_gpio.c
	@@ -371,8 +371,8 @@
	sc->swporta_ddr = rk_gpio_read_4(sc, RK_GPIO_SWPORTA_DDR);
	RK_GPIO_UNLOCK(sc);

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ err = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (err != 0) {
	rk_gpio_detach(dev);
	return (ENXIO);
	}
	diff --git a/sys/arm64/rockchip/rk_grf_gpio.c b/sys/arm64/rockchip/rk_grf_gpio.c
	--- a/sys/arm64/rockchip/rk_grf_gpio.c
	+++ b/sys/arm64/rockchip/rk_grf_gpio.c
	@@ -181,8 +181,7 @@
	return (ENXIO);
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev) != 0) {
	return (ENXIO);
	}

	diff --git a/sys/dev/amdgpio/amdgpio.c b/sys/dev/amdgpio/amdgpio.c
	--- a/sys/dev/amdgpio/amdgpio.c
	+++ b/sys/dev/amdgpio/amdgpio.c
	@@ -408,8 +408,7 @@
	GPIO_PIN_OUTPUT : GPIO_PIN_INPUT;
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev)) {
	device_printf(dev, "could not attach gpiobus\n");
	goto err_bus;
	}
	diff --git a/sys/dev/bhnd/cores/chipc/chipc_gpio.c b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
	--- a/sys/dev/bhnd/cores/chipc/chipc_gpio.c
	+++ b/sys/dev/bhnd/cores/chipc/chipc_gpio.c
	@@ -173,7 +173,7 @@
	if (CC_GPIO_QUIRK(sc, NO_GPIOC)) {
	sc->gpiobus = NULL;
	} else {
	- if ((sc->gpiobus = gpiobus_attach_bus(dev)) == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->gpiobus)) {
	device_printf(dev, "failed to attach gpiobus\n");
	error = ENXIO;
	goto failed;
	diff --git a/sys/dev/ftgpio/ftgpio.c b/sys/dev/ftgpio/ftgpio.c
	--- a/sys/dev/ftgpio/ftgpio.c
	+++ b/sys/dev/ftgpio/ftgpio.c
	@@ -398,8 +398,7 @@
	FTGPIO_VERBOSE_PRINTF(sc->dev, "groups GPIO1..GPIO6 enabled\n");

	GPIO_UNLOCK(sc);
	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	GPIO_LOCK_DESTROY(sc);
	return (ENXIO);
	}
	diff --git a/sys/dev/gpio/bytgpio.c b/sys/dev/gpio/bytgpio.c
	--- a/sys/dev/gpio/bytgpio.c
	+++ b/sys/dev/gpio/bytgpio.c
	@@ -608,8 +608,7 @@
	sc->sc_pad_funcs[pin] = val & BYTGPIO_PCONF0_FUNC_MASK;
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev) != 0) {
	BYTGPIO_LOCK_DESTROY(sc);
	bus_release_resource(dev, SYS_RES_MEMORY,
	sc->sc_mem_rid, sc->sc_mem_res);
	diff --git a/sys/dev/gpio/chvgpio.c b/sys/dev/gpio/chvgpio.c
	--- a/sys/dev/gpio/chvgpio.c
	+++ b/sys/dev/gpio/chvgpio.c
	@@ -441,8 +441,8 @@
	bus_write_4(sc->sc_mem_res, CHVGPIO_INTERRUPT_MASK, 0);
	bus_write_4(sc->sc_mem_res, CHVGPIO_INTERRUPT_STATUS, 0xffff);

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ error = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (error) {
	CHVGPIO_LOCK_DESTROY(sc);
	bus_release_resource(dev, SYS_RES_MEMORY,
	sc->sc_mem_rid, sc->sc_mem_res);
	diff --git a/sys/dev/gpio/dwgpio/dwgpio.c b/sys/dev/gpio/dwgpio/dwgpio.c
	--- a/sys/dev/gpio/dwgpio/dwgpio.c
	+++ b/sys/dev/gpio/dwgpio/dwgpio.c
	@@ -167,8 +167,7 @@
	snprintf(sc->gpio_pins[i].gp_name, GPIOMAXNAME,
	"dwgpio%d.%d", device_get_unit(dev), i);
	}
	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	mtx_destroy(&sc->sc_mtx);
	return (ENXIO);
	}
	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
	@@ -335,17 +335,18 @@
	* Note that the controller is expected
	* to be fully initialized at this point.
	*/
	-device_t
	-gpiobus_attach_bus(device_t dev)
	+int
	+gpiobus_attach_bus(device_t dev, device_t *busdevp)
	{
	device_t busdev;

	busdev = gpiobus_add_bus(dev);
	if (busdev == NULL)
	- return (NULL);
	+ return (ENXIO);

	+ *busdevp = busdev;
	bus_attach_children(dev);
	- return (busdev);
	+ return (0);
	}

	int
	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
	@@ -171,7 +171,7 @@

	int gpio_check_flags(uint32_t, uint32_t);
	device_t gpiobus_add_bus(device_t);
	-device_t gpiobus_attach_bus(device_t);
	+int gpiobus_attach_bus(device_t, device_t *);
	int gpiobus_detach_bus(device_t);

	#endif /* __GPIOBUS_H__ */
	diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c
	--- a/sys/dev/gpio/pl061.c
	+++ b/sys/dev/gpio/pl061.c
	@@ -495,8 +495,8 @@
	goto free_isrc;
	}

	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ ret = gpiobus_attach_bus(dev, &sc->sc_busdev);
	+ if (ret) {
	device_printf(dev, "couldn't attach gpio bus\n");
	PL061_LOCK_DESTROY(sc);
	goto free_isrc;
	diff --git a/sys/dev/gpio/qoriq_gpio.c b/sys/dev/gpio/qoriq_gpio.c
	--- a/sys/dev/gpio/qoriq_gpio.c
	+++ b/sys/dev/gpio/qoriq_gpio.c
	@@ -379,8 +379,7 @@

	OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev);

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	qoriq_gpio_detach(dev);
	return (ENOMEM);
	}
	diff --git a/sys/dev/iicbus/gpio/pcf8574.c b/sys/dev/iicbus/gpio/pcf8574.c
	--- a/sys/dev/iicbus/gpio/pcf8574.c
	+++ b/sys/dev/iicbus/gpio/pcf8574.c
	@@ -142,8 +142,7 @@
	(void)pcf8574_write(sc, 0xff);

	sx_init(&sc->lock, "pcf8574");
	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	device_printf(dev, "Could not create busdev child\n");
	sx_destroy(&sc->lock);
	return (ENXIO);
	diff --git a/sys/dev/iicbus/gpio/tca64xx.c b/sys/dev/iicbus/gpio/tca64xx.c
	--- a/sys/dev/iicbus/gpio/tca64xx.c
	+++ b/sys/dev/iicbus/gpio/tca64xx.c
	@@ -262,8 +262,7 @@

	mtx_init(&sc->mtx, "tca64xx gpio", "gpio", MTX_DEF);
	OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev);
	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	device_printf(dev, "Could not create busdev child\n");
	return (ENXIO);
	}
	diff --git a/sys/dev/nctgpio/nctgpio.c b/sys/dev/nctgpio/nctgpio.c
	--- a/sys/dev/nctgpio/nctgpio.c
	+++ b/sys/dev/nctgpio/nctgpio.c
	@@ -1135,7 +1135,7 @@
	struct nct_gpio_group *gp;
	uint32_t pin_num;
	uint8_t v;
	- int flags, i, g;
	+ int flags, err, i, g;

	sc = device_get_softc(dev);
	sc->dev = dev;
	@@ -1158,8 +1158,6 @@
	if (dev_8 != NULL)
	iobase = superio_get_iobase(dev_8);
	if (iobase != 0 && iobase != 0xffff) {
	- int err;
	-
	NCT_VERBOSE_PRINTF(dev, "iobase %#x\n", iobase);
	sc->curgrp = -1;
	sc->iorid = 0;
	@@ -1258,8 +1256,8 @@

	GPIO_UNLOCK(sc);

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ err = gpiobus_attach_bus(dev, &sc->busdev);
	+ if (err != 0) {
	device_printf(dev, "failed to attach to gpiobus\n");
	GPIO_LOCK_DESTROY(sc);
	return (ENXIO);
	diff --git a/sys/dev/p2sb/lewisburg_gpio.c b/sys/dev/p2sb/lewisburg_gpio.c
	--- a/sys/dev/p2sb/lewisburg_gpio.c
	+++ b/sys/dev/p2sb/lewisburg_gpio.c
	@@ -217,8 +217,7 @@
	}

	/* support gpio */
	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL)
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev) != 0)
	return (ENXIO);

	return (0);
	diff --git a/sys/dev/qcom_tlmm/qcom_tlmm_ipq4018.c b/sys/dev/qcom_tlmm/qcom_tlmm_ipq4018.c
	--- a/sys/dev/qcom_tlmm/qcom_tlmm_ipq4018.c
	+++ b/sys/dev/qcom_tlmm/qcom_tlmm_ipq4018.c
	@@ -346,8 +346,7 @@
	fdt_pinctrl_register(dev, NULL);
	fdt_pinctrl_configure_by_name(dev, "default");

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev)) {
	device_printf(dev, "%s: failed to attach bus\n", __func__);
	qcom_tlmm_ipq4018_detach(dev);
	return (ENXIO);
	diff --git a/sys/dev/rccgpio/rccgpio.c b/sys/dev/rccgpio/rccgpio.c
	--- a/sys/dev/rccgpio/rccgpio.c
	+++ b/sys/dev/rccgpio/rccgpio.c
	@@ -308,8 +308,7 @@
	RCC_WRITE(sc, RCC_GPIO_GP_LVL, sc->sc_output);

	/* Attach the gpiobus. */
	- sc->sc_busdev = gpiobus_attach_bus(dev);
	- if (sc->sc_busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->sc_busdev) != 0) {
	bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_io_rid,
	sc->sc_io_res);
	mtx_destroy(&sc->sc_mtx);
	diff --git a/sys/dev/usb/misc/cp2112.c b/sys/dev/usb/misc/cp2112.c
	--- a/sys/dev/usb/misc/cp2112.c
	+++ b/sys/dev/usb/misc/cp2112.c
	@@ -708,8 +708,8 @@
	}
	}

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ err = gpiobus_attach_bus(dev, &sc->busdev);
	+ if (err != 0) {
	device_printf(dev, "gpiobus_attach_bus failed\n");
	goto detach;
	}
	diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c
	--- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c
	+++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c
	@@ -228,8 +228,7 @@

	OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev);

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	mpc85xx_gpio_detach(dev);
	return (ENOMEM);
	}
	diff --git a/sys/riscv/sifive/sifive_gpio.c b/sys/riscv/sifive/sifive_gpio.c
	--- a/sys/riscv/sifive/sifive_gpio.c
	+++ b/sys/riscv/sifive/sifive_gpio.c
	@@ -157,8 +157,7 @@
	sc->gpio_pins[i].gp_name[GPIOMAXNAME - 1] = '\0';
	}

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	device_printf(dev, "Cannot attach gpiobus\n");
	error = ENXIO;
	goto fail;
	diff --git a/sys/riscv/starfive/jh7110_gpio.c b/sys/riscv/starfive/jh7110_gpio.c
	--- a/sys/riscv/starfive/jh7110_gpio.c
	+++ b/sys/riscv/starfive/jh7110_gpio.c
	@@ -321,8 +321,7 @@
	JH7110_GPIO_WRITE(sc, GPIOE_1, 0);
	JH7110_GPIO_WRITE(sc, GPIOEN, 1);

	- sc->busdev = gpiobus_attach_bus(dev);
	- if (sc->busdev == NULL) {
	+ if (gpiobus_attach_bus(dev, &sc->busdev) != 0) {
	device_printf(dev, "Cannot attach gpiobus\n");
	jh7110_gpio_detach(dev);
	return (ENXIO);

File Metadata

Mime Type: text/plain
Expires: Fri, Apr 24, 10:01 AM (5 h, 6 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32071758
Default Alt Text: D51578.id160023.diff (15 KB)

D51578.id160023.diffNo OneTemporaryActions

D51578.id160023.diffView Options

File Metadata

Event Timeline

D51578.id160023.diff
No OneTemporary
Actions

D51578.id160023.diff
View Options