Skip to content

Commit 01255f5

Browse files
committed
Merge tag 'v6.12.73' into 6.12-main
This is the 6.12.73 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmmTQToACgkQONu9yGCS # aT6V0RAAwep1VRckPJ0iEYmITAlM34SHUwOlfirmpwlg5h8Ofg7qASAaCmfNvtoh # r9r3tSnrTJuYph4EmvgTNEUD/1pZ+yJ96bZUJi77NDPaGBuXg83lgb9ErX/P6k8G # Nr7FXseahsmxzyWpFRuTNukqGsYpMUPyDylri14Dy4N0UlsQN2I4EhAdHPyPOoBG # jeFWxxVzaVqoIy7emLoSZbUE//keFiFz/mL9bB5Eafst553SUc3106c7DceLT13M # 6I9ovlNhYAHPk/AUYFlQjcRDo3SQUDHrsKppTQFfg5JU2oVNfuwR4f5crSPr1CRd # OSir0UhE4PFlsNVk4di+JdfADKZpPEtslxacYAxLW/ztWPvLOYYOgNyYS1V0XCvK # ZypXSYmIxmwXlQARItqeqZJCXmavcfmjbZKzHQtEiWUHT0JachD9jp7CvomQ1Eve # HU7kh1HpYMx7TpDxl7CXa0Npy7JmG+SHDa8kG+i9DtLTE3rNBC3Q5nVeKbgx/IBO # UGpuwpIjjGuYAZaeyOVfO6efwPuV5aU1Us2eoYmwp9jeUv3zRp22wc5rfr2YQRks # E6ga8gOwJShFd+sQf0AYpwejVZQgv8eUTqgXxXqDaYRh3dnZGVQ/ZiGbhmkJJN/K # eDCgnyDXcm1ob54QPj5ODWd7ES28qBwoHIHAQcipMjYzy5FXt1o= # =nksB # -----END PGP SIGNATURE----- # gpg: Signature made Mon Feb 16 17:09:30 2026 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 5307468 + 5fb0303 commit 01255f5

4 files changed

Lines changed: 3 additions & 12 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 72
4+
SUBLEVEL = 73
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

drivers/base/base.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,9 @@ void device_set_deferred_probe_reason(const struct device *dev, struct va_format
165165
static inline int driver_match_device(const struct device_driver *drv,
166166
struct device *dev)
167167
{
168-
device_lock_assert(dev);
169-
170168
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
171169
}
172170

173-
static inline int driver_match_device_locked(const struct device_driver *drv,
174-
struct device *dev)
175-
{
176-
guard(device)(dev);
177-
return driver_match_device(drv, dev);
178-
}
179-
180171
static inline void dev_sync_state(struct device *dev)
181172
{
182173
if (dev->bus->sync_state)

drivers/base/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf,
263263
int err = -ENODEV;
264264

265265
dev = bus_find_device_by_name(bus, NULL, buf);
266-
if (dev && driver_match_device_locked(drv, dev)) {
266+
if (dev && driver_match_device(drv, dev)) {
267267
err = device_driver_attach(drv, dev);
268268
if (!err) {
269269
/* success */

drivers/base/dd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ static int __driver_attach(struct device *dev, void *data)
11681168
* is an error.
11691169
*/
11701170

1171-
ret = driver_match_device_locked(drv, dev);
1171+
ret = driver_match_device(drv, dev);
11721172
if (ret == 0) {
11731173
/* no match */
11741174
return 0;

0 commit comments

Comments
 (0)