63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 4a944e80769044..54c385978feed5 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 6
|
|
PATCHLEVEL = 6
|
|
-SUBLEVEL = 125
|
|
+SUBLEVEL = 126
|
|
EXTRAVERSION =
|
|
NAME = Pinguïn Aangedreven
|
|
|
|
diff --git a/drivers/base/base.h b/drivers/base/base.h
|
|
index 35e14bebbfb2c2..0b491449b022a1 100644
|
|
--- a/drivers/base/base.h
|
|
+++ b/drivers/base/base.h
|
|
@@ -165,18 +165,9 @@ void device_set_deferred_probe_reason(const struct device *dev, struct va_format
|
|
static inline int driver_match_device(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(struct device_driver *drv,
|
|
- struct device *dev)
|
|
-{
|
|
- guard(device)(dev);
|
|
- return driver_match_device(drv, dev);
|
|
-}
|
|
-
|
|
static inline void dev_sync_state(struct device *dev)
|
|
{
|
|
if (dev->bus->sync_state)
|
|
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
|
|
index 27f8442a3aa9dd..b97e13a52c3308 100644
|
|
--- a/drivers/base/bus.c
|
|
+++ b/drivers/base/bus.c
|
|
@@ -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 */
|
|
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
|
|
index 07f1332dd3a440..7e2fb159bb895b 100644
|
|
--- a/drivers/base/dd.c
|
|
+++ b/drivers/base/dd.c
|
|
@@ -1169,7 +1169,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;
|