diff options
Diffstat (limited to 'drivers/thunderbolt/retimer.c')
| -rw-r--r-- | drivers/thunderbolt/retimer.c | 20 | 
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/thunderbolt/retimer.c b/drivers/thunderbolt/retimer.c index 81252e31014a..56008eb91e2e 100644 --- a/drivers/thunderbolt/retimer.c +++ b/drivers/thunderbolt/retimer.c @@ -427,13 +427,6 @@ int tb_retimer_scan(struct tb_port *port, bool add)  {  	u32 status[TB_MAX_RETIMER_INDEX + 1] = {};  	int ret, i, last_idx = 0; -	struct usb4_port *usb4; - -	usb4 = port->usb4; -	if (!usb4) -		return 0; - -	pm_runtime_get_sync(&usb4->dev);  	/*  	 * Send broadcast RT to make sure retimer indices facing this @@ -441,7 +434,7 @@ int tb_retimer_scan(struct tb_port *port, bool add)  	 */  	ret = usb4_port_enumerate_retimers(port);  	if (ret) -		goto out; +		return ret;  	/*  	 * Enable sideband channel for each retimer. We can do this @@ -471,12 +464,11 @@ int tb_retimer_scan(struct tb_port *port, bool add)  			break;  	} -	if (!last_idx) { -		ret = 0; -		goto out; -	} +	if (!last_idx) +		return 0;  	/* Add on-board retimers if they do not exist already */ +	ret = 0;  	for (i = 1; i <= last_idx; i++) {  		struct tb_retimer *rt; @@ -490,10 +482,6 @@ int tb_retimer_scan(struct tb_port *port, bool add)  		}  	} -out: -	pm_runtime_mark_last_busy(&usb4->dev); -	pm_runtime_put_autosuspend(&usb4->dev); -  	return ret;  }  | 
