diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 11:18:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 11:18:30 +0100 |
| commit | 8c3878ab25251aa8021dd58fb3ded452b549c1a5 (patch) | |
| tree | 4a17f2db894494224859b075504253e814450f1f /include | |
| parent | d2a7fa4320c9631d230b656cb975317f32d601b0 (diff) | |
| parent | 8c51ea651d043c786c37668c51624bd6b338a0ef (diff) | |
| download | linux-next-8c3878ab25251aa8021dd58fb3ded452b549c1a5.tar.gz linux-next-8c3878ab25251aa8021dd58fb3ded452b549c1a5.zip | |
Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thunderbolt.h | 3 | ||||
| -rw-r--r-- | include/linux/usb/serial.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h index d48623fda79b..b62dfa52b149 100644 --- a/include/linux/thunderbolt.h +++ b/include/linux/thunderbolt.h @@ -22,6 +22,7 @@ struct device; #include <linux/device.h> #include <linux/idr.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/mutex.h> #include <linux/device-id/tb.h> #include <linux/pci.h> @@ -565,6 +566,7 @@ struct tb_nhi { * @interval_nsec: Interval counter if interrupt throttling is to be * used with this ring (in ns) * @wait: Used to signal that the ring may be empty now + * @lock_key: Lock validator class key per-ring */ struct tb_ring { spinlock_t lock; @@ -590,6 +592,7 @@ struct tb_ring { void *poll_data; unsigned int interval_nsec; wait_queue_head_t wait; + struct lock_class_key lock_key; }; /* Leave ring interrupt enabled on suspend */ diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 534e6650e2aa..ab0a32a90629 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -381,6 +381,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, int usb_serial_bus_register(struct usb_serial_driver *device); void usb_serial_bus_deregister(struct usb_serial_driver *device); +void usb_serial_bus_remove_new_id(struct usb_serial_driver *driver); extern const struct bus_type usb_serial_bus_type; extern struct tty_driver *usb_serial_tty_driver; |