driver core: fix inverted "locked" suffix of driver_match_device()
Danilo Krummrich
maintainerPATCH 1/1 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.
--- drivers/base/base.h | 10 +++++----- drivers/base/bus.c | 2 +- drivers/base/dd.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/base/base.h +5 -5
@@ -179,19 +179,19 @@ void device_release_driver_internal(struct device *dev, const struct device_drivvoid 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, -struct device *dev) +static inline int driver_match_device_locked (const struct device_driver *drv, +struct device *dev) {device_lock_assert (dev);return drv->bus->match ? drv->bus->match (dev, drv) :1 ; } -static inline int driver_match_device_locked (const struct device_driver *drv, -struct device *dev) +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
@@ -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
@@ -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 ;
base-commit: c71257394bc9c59ea727803f6e55e83fe63db74e
Signature · 1 line
2.52.0
Quoted 10 lines · Danilo Krummrich
In the current implementation
driver_match_device()expects the device lock to be held, whiledriver_match_device_locked()acquires the device lock.By convention it should be the other way around, hence swap the name of both functions.
Fixes dc23806a7c47 ("driver core: enforce device_lock for driver_match_device()")Signed-off-by Danilo Krummrich <[email protected]>
Looks good to me. Thanks for fixing the naming convention.
Quoted 9 lines · Danilo Krummrich
In the current implementation
driver_match_device()expects the device lock to be held, whiledriver_match_device_locked()acquires the device lock.By convention it should be the other way around, hence swap the name of both functions.
Fixes dc23806a7c47 ("driver core: enforce device_lock for driver_match_device()")Signed-off-by Danilo Krummrich <[email protected]>
Danilo Krummrich
maintainerQuoted 9 lines · Danilo Krummrich
In the current implementation
driver_match_device()expects the device lock to be held, whiledriver_match_device_locked()acquires the device lock.By convention it should be the other way around, hence swap the name of both functions.
Fixes dc23806a7c47 ("driver core: enforce device_lock for driver_match_device()")Signed-off-by Danilo Krummrich <[email protected]>
Applied to driver-core-testing, thanks!