Commit 289b1459 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

driver core: fix inverted "locked" suffix of driver_match_device() 



In the current implementation driver_match_device() expects the device
lock to be held, while driver_match_device_locked() acquires the device
lock.

By convention it should be the other way around, hence swap the name of
both functions.

Fixes: dc23806a ("driver core: enforce device_lock for driver_match_device()")
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarGui-Dong Han <hanguidong02@gmail.com>
Link: https://patch.msgid.link/20260131014211.12841-1-dakr@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent 726c2620

drivers/base/base.h

+5 −5
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void device_release_driver_internal(struct device *dev, const struct device_driv 
void driver_detach(const struct device_driver *drv);

void driver_deferred_probe_del(struct device *dev);

void device_set_deferred_probe_reason(const struct device *dev, struct va_format *vaf);

static inline int driver_match_device(const struct device_driver *drv,

static inline int driver_match_device_locked(const struct device_driver *drv,

					     struct device *dev)

{

	device_lock_assert(dev);
@@ -187,11 +187,11 @@ static inline int driver_match_device(const struct device_driver *drv, 
	return drv->bus->match ? drv->bus->match(dev, drv) : 1;

}



static inline int driver_match_device_locked(const struct device_driver *drv,

static inline int driver_match_device(const struct device_driver *drv,

				      struct device *dev)

{

	guard(device)(dev);

	return driver_match_device(drv, dev);

	return driver_match_device_locked(drv, dev);

}



static inline void dev_sync_state(struct device *dev)

drivers/base/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf, 
	int err = -ENODEV;



	dev = bus_find_device_by_name(bus, NULL, buf);

	if (dev && driver_match_device_locked(drv, dev)) {

	if (dev && driver_match_device(drv, dev)) {

		err = device_driver_attach(drv, dev);

		if (!err) {

			/* success */

drivers/base/dd.c

+2 −2
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static int __device_attach_driver(struct device_driver *drv, void *_data) 
	bool async_allowed;

	int ret;



	ret = driver_match_device(drv, dev);

	ret = driver_match_device_locked(drv, dev);

	if (ret == 0) {

		/* no match */

		return 0;
@@ -1180,7 +1180,7 @@ static int __driver_attach(struct device *dev, void *data) 
	 * is an error.

	 */



	ret = driver_match_device_locked(drv, dev);

	ret = driver_match_device(drv, dev);

	if (ret == 0) {

		/* no match */

		return 0;