Commit cc11f4ef authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Bartosz Golaszewski
Browse files

gpio: Access `gpio_bus_type` in gpiochip_setup_dev() 



To make the intent clear, access `gpio_bus_type` only when it's ready in
gpiochip_setup_dev().

Reviewed-by: default avatarLinus Walleij <linusw@kernel.org>
Signed-off-by: default avatarTzung-Bi Shih <tzungbi@kernel.org>
Link: https://patch.msgid.link/20260223061726.82161-2-tzungbi@kernel.org


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent b08b3f16

drivers/gpio/gpiolib.c

+4 −3
Original line number Diff line number Diff line
@@ -902,6 +902,8 @@ static int gpiochip_setup_dev(struct gpio_device *gdev) 
	struct fwnode_handle *fwnode = dev_fwnode(&gdev->dev);

	int ret;



	gdev->dev.bus = &gpio_bus_type;



	/*

	 * If fwnode doesn't belong to another device, it's safe to clear its

	 * initialized flag.
@@ -1083,7 +1085,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	 * then make sure they get free():ed there.

	 */

	gdev->dev.type = &gpio_dev_type;

	gdev->dev.bus = &gpio_bus_type;

	gdev->dev.parent = gc->parent;

	device_set_node(&gdev->dev, gpiochip_choose_fwnode(gc));
@@ -1221,8 +1222,8 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	 * we get a device node entry in sysfs under

	 * /sys/bus/gpio/devices/gpiochipN/dev that can be used for

	 * coldplug of device nodes and other udev business.

	 * We can do this only if gpiolib has been initialized.

	 * Otherwise, defer until later.

	 * We can do this only if gpiolib has been initialized

	 * (i.e., `gpio_bus_type` is ready).  Otherwise, defer until later.

	 */

	if (gpiolib_initialized) {

		ret = gpiochip_setup_dev(gdev);