Commit 3f58ee54 authored by Zijun Hu's avatar Zijun Hu Committed by Greg Kroah-Hartman
Browse files

driver core: Move true expression out of if condition in 3 device finding APIs 



For bus_find_device(), driver_find_device(), and device_find_child(), all
of their function body have pattern below:

{
	struct klist_iter i;
	struct device *dev;

	...
	while ((dev = next_device(&i)))
		if (match(dev, data) && get_device(dev))
			break;
	...
}

The expression 'get_device(dev)' in the if condition always returns true
since @dev != NULL.

Move the expression to if body to make logic of these APIs more clearer.

Reviewed-by: default avatarFan Ni <fan.ni@samsung.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250105-class_fix-v6-3-3a2f1768d4d4@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1248436

drivers/base/bus.c

+5 −2
Original line number Diff line number Diff line
@@ -402,9 +402,12 @@ struct device *bus_find_device(const struct bus_type *bus, 


	klist_iter_init_node(&sp->klist_devices, &i,

			     (start ? &start->p->knode_bus : NULL));

	while ((dev = next_device(&i)))

		if (match(dev, data) && get_device(dev))

	while ((dev = next_device(&i))) {

		if (match(dev, data)) {

			get_device(dev);

			break;

		}

	}

	klist_iter_exit(&i);

	subsys_put(sp);

	return dev;

drivers/base/core.c

+5 −2
Original line number Diff line number Diff line
@@ -4089,9 +4089,12 @@ struct device *device_find_child(struct device *parent, const void *data, 
		return NULL;



	klist_iter_init(&parent->p->klist_children, &i);

	while ((child = next_device(&i)))

		if (match(child, data) && get_device(child))

	while ((child = next_device(&i))) {

		if (match(child, data)) {

			get_device(child);

			break;

		}

	}

	klist_iter_exit(&i);

	return child;

}

drivers/base/driver.c

+5 −2
Original line number Diff line number Diff line
@@ -160,9 +160,12 @@ struct device *driver_find_device(const struct device_driver *drv, 


	klist_iter_init_node(&drv->p->klist_devices, &i,

			     (start ? &start->p->knode_driver : NULL));

	while ((dev = next_device(&i)))

		if (match(dev, data) && get_device(dev))

	while ((dev = next_device(&i))) {

		if (match(dev, data)) {

			get_device(dev);

			break;

		}

	}

	klist_iter_exit(&i);

	return dev;

}