Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4351849 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Jack Pham
Browse files

usb: typec: ucsi: Optimise ucsi_unregister() 



There is no need to reset the PPM when the interface is
unregistered. Quietly silencing the notifications and then
unregistering everything is enough. This speeds up
ucsi_unregister() a lot.

Change-Id: Ib309aa79ee12ebd6a0e299b64046073bd7866a24
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: default avatarAjay Gupta <ajayg@nvidia.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20191104142435.29960-19-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 74ce3e41274805e4a5598f4d98ee4d5160466d07
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git


Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent d78a8b48

drivers/usb/typec/ucsi/ucsi.c

+3 −6
Original line number Diff line number Diff line
@@ -1045,15 +1045,14 @@ EXPORT_SYMBOL_GPL(ucsi_register); 
 */

void ucsi_unregister(struct ucsi *ucsi)

{

	u64 command;

	u64 cmd = UCSI_SET_NOTIFICATION_ENABLE;

	int i;



	/* Make sure that we are not in the middle of driver initialization */

	cancel_work_sync(&ucsi->work);



	/* Disable everything except command complete notification */

	command = UCSI_SET_NOTIFICATION_ENABLE | UCSI_ENABLE_NTFY_CMD_COMPLETE;

	ucsi_send_command(ucsi, command, NULL, 0);

	/* Disable notifications */

	ucsi->ops->async_write(ucsi, UCSI_CONTROL, &cmd, sizeof(cmd));



	for (i = 0; i < ucsi->cap.num_connectors; i++) {

		cancel_work_sync(&ucsi->connector[i].work);
@@ -1063,8 +1062,6 @@ void ucsi_unregister(struct ucsi *ucsi) 
		typec_unregister_port(ucsi->connector[i].port);

	}



	ucsi_reset_ppm(ucsi);



	kfree(ucsi->connector);

}

EXPORT_SYMBOL_GPL(ucsi_unregister);