diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-29 13:26:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-29 13:26:13 +0100 |
| commit | 4051a1c96e4883f3445cc8f239c214be622f4c6c (patch) | |
| tree | b48051bc2ee747b7bdc8565d3ab956026eaee095 /drivers/thunderbolt/switch.c | |
| parent | b47ec9727f47d1dce4e8cbc9aef01c80b2332535 (diff) | |
| parent | a5cfc9d65879c0d377f732531a2e80ee3a9eebbc (diff) | |
Merge tag 'thunderbolt-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
Mika writes:
thunderbolt: Changes for v6.2 merge window
This includes following Thunderbolt/USB4 changes for the v6.2 merge
window:
- Add wake on connect/disconnect for USB4 ports
- A couple of minor cleanups
All these have been in linux-next with no reported issues.
* tag 'thunderbolt-for-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
thunderbolt: Add wake on connect/disconnect on USB4 ports
thunderbolt: ACPI: Use the helper fwnode_find_reference()
thunderbolt: Remove redundant assignment to variable len
thunderbolt: Use str_enabled_disabled() helper
Diffstat (limited to 'drivers/thunderbolt/switch.c')
| -rw-r--r-- | drivers/thunderbolt/switch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 60da5c23ccaf..363d712aa364 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -8,12 +8,13 @@ #include <linux/delay.h> #include <linux/idr.h> +#include <linux/module.h> #include <linux/nvmem-provider.h> #include <linux/pm_runtime.h> #include <linux/sched/signal.h> #include <linux/sizes.h> #include <linux/slab.h> -#include <linux/module.h> +#include <linux/string_helpers.h> #include "tb.h" @@ -644,7 +645,7 @@ static int __tb_port_enable(struct tb_port *port, bool enable) if (ret) return ret; - tb_port_dbg(port, "lane %sabled\n", enable ? "en" : "dis"); + tb_port_dbg(port, "lane %s\n", str_enabled_disabled(enable)); return 0; } |