Commit cab96faa authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Drop tb_tunnel_restart() 



It is pretty much the same as tb_tunnel_activate() excepts does check
for already activated paths. This is not needed anymore and makes it
more streamlined so drop tb_tunnel_restart() in favour of
tb_tunnel_activate().

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent ae765788

drivers/thunderbolt/tb.c

+2 −2
Original line number Diff line number Diff line
@@ -3037,7 +3037,7 @@ static int tb_resume_noirq(struct tb *tb) 
			/* Only need to do it once */

			usb3_delay = 0;

		}

		tb_tunnel_restart(tunnel);

		tb_tunnel_activate(tunnel);

	}

	if (!list_empty(&tcm->tunnel_list)) {

		/*
@@ -3147,7 +3147,7 @@ static int tb_runtime_resume(struct tb *tb) 
	tb_free_invalid_tunnels(tb);

	tb_restore_children(tb->root_switch);

	list_for_each_entry_safe(tunnel, n, &tcm->tunnel_list, list)

		tb_tunnel_restart(tunnel);

		tb_tunnel_activate(tunnel);

	tb_switch_enter_redrive(tb->root_switch);

	tcm->hotplug_active = true;

	mutex_unlock(&tb->lock);

drivers/thunderbolt/tunnel.c

+3 −24
Original line number Diff line number Diff line
@@ -2170,12 +2170,12 @@ bool tb_tunnel_is_invalid(struct tb_tunnel *tunnel) 
}



/**

 * tb_tunnel_restart() - activate a tunnel after a hardware reset

 * @tunnel: Tunnel to restart

 * tb_tunnel_activate() - activate a tunnel

 * @tunnel: Tunnel to activate

 *

 * Return: 0 on success and negative errno in case if failure

 */

int tb_tunnel_restart(struct tb_tunnel *tunnel)

int tb_tunnel_activate(struct tb_tunnel *tunnel)

{

	int res, i;
@@ -2218,27 +2218,6 @@ int tb_tunnel_restart(struct tb_tunnel *tunnel) 
	return res;

}



/**

 * tb_tunnel_activate() - activate a tunnel

 * @tunnel: Tunnel to activate

 *

 * Return: Returns 0 on success or an error code on failure.

 */

int tb_tunnel_activate(struct tb_tunnel *tunnel)

{

	int i;



	for (i = 0; i < tunnel->npaths; i++) {

		if (tunnel->paths[i]->activated) {

			tb_tunnel_WARN(tunnel,

				       "trying to activate an already activated tunnel\n");

			return -EINVAL;

		}

	}



	return tb_tunnel_restart(tunnel);

}



/**

 * tb_tunnel_deactivate() - deactivate a tunnel

 * @tunnel: Tunnel to deactivate

drivers/thunderbolt/tunnel.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ struct tb_tunnel *tb_tunnel_alloc_usb3(struct tb *tb, struct tb_port *up, 


void tb_tunnel_free(struct tb_tunnel *tunnel);

int tb_tunnel_activate(struct tb_tunnel *tunnel);

int tb_tunnel_restart(struct tb_tunnel *tunnel);

void tb_tunnel_deactivate(struct tb_tunnel *tunnel);

bool tb_tunnel_is_invalid(struct tb_tunnel *tunnel);

bool tb_tunnel_port_on_path(const struct tb_tunnel *tunnel,