[SRU Jammy][PATCH 1/2] Revert "UBUNTU: SAUCE: thunderbolt: Add DP out resource when DP tunnel is discovered."
Stefan Bader
stefan.bader at canonical.com
Thu Nov 10 17:19:11 UTC 2022
BugLink: https://bugs.launchpad.net/bugs/1989944
This reverts commit c8ce3e4fd19d65e6393c04f6c170b516f68c2db4 to be
replaced by the upstream variant.
Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
drivers/thunderbolt/tb.c | 15 ---------------
drivers/thunderbolt/tb.h | 1 -
drivers/thunderbolt/tunnel.c | 2 --
3 files changed, 18 deletions(-)
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index eeff620ef407..ea77b4369c7e 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -1007,21 +1007,6 @@ static void tb_dp_resource_unavailable(struct tb *tb, struct tb_port *port)
tb_tunnel_dp(tb);
}
-void tb_dp_resource_available_discovered(struct tb *tb, struct tb_port *port)
-{
- struct tb_cm *tcm = tb_priv(tb);
- struct tb_port *p;
-
- list_for_each_entry(p, &tcm->dp_resources, list) {
- if (p == port)
- return;
- }
-
- tb_port_dbg(port, "DP %s resource available discovered\n",
- tb_port_is_dpin(port) ? "IN" : "OUT");
- list_add_tail(&port->list, &tcm->dp_resources);
-}
-
static void tb_dp_resource_available(struct tb *tb, struct tb_port *port)
{
struct tb_cm *tcm = tb_priv(tb);
diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h
index 3149b3ca0f2e..3fae40670b72 100644
--- a/drivers/thunderbolt/tb.h
+++ b/drivers/thunderbolt/tb.h
@@ -956,7 +956,6 @@ int tb_dp_port_set_hops(struct tb_port *port, unsigned int video,
unsigned int aux_tx, unsigned int aux_rx);
bool tb_dp_port_is_enabled(struct tb_port *port);
int tb_dp_port_enable(struct tb_port *port, bool enable);
-void tb_dp_resource_available_discovered(struct tb *tb, struct tb_port *port);
struct tb_path *tb_path_discover(struct tb_port *src, int src_hopid,
struct tb_port *dst, int dst_hopid,
diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index d85b41a093b9..500a0afe3073 100644
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -832,8 +832,6 @@ struct tb_tunnel *tb_tunnel_discover_dp(struct tb *tb, struct tb_port *in,
goto err_deactivate;
}
- tb_dp_resource_available_discovered(tb, tunnel->dst_port);
-
tb_tunnel_dbg(tunnel, "discovered\n");
return tunnel;
--
2.25.1
More information about the kernel-team
mailing list