Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: typec: ucsi: move ucsi_acknowledge() from ucsi_read_error()

Browse Source 
As a preparation for reworking UCSI command handling, move
ucsi_acknowledge() for the failed command from ucsi_read_error() to
ucsi_exec_command().

Tested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240627-ucsi-rework-interface-v4-1-289ddc6874c7@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Baryshkov 2024-06-27 17:44:40 +03:00 committed by Greg Kroah-Hartman
parent f7697db8b1
commit a7d2fa7769
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/typec/ucsi/ucsi.c
View File

@ -71,11 +71,6 @@ static int ucsi_read_error(struct ucsi *ucsi, u8 connector_num)
u16 error;
int ret;
/* Acknowledge the command that failed */
ret = ucsi_acknowledge(ucsi, false);
if (ret)
return ret;
command = UCSI_GET_ERROR_STATUS | UCSI_CONNECTOR_NUMBER(connector_num);
ret = ucsi_exec_command(ucsi, command);
if (ret < 0)
@ -182,13 +177,14 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd)
}
if (cci & UCSI_CCI_ERROR) {
if (cmd == UCSI_GET_ERROR_STATUS) {
ret = ucsi_acknowledge(ucsi, false);
if (ret)
return ret;
/* Acknowledge the command that failed */
ret = ucsi_acknowledge(ucsi, false);
if (ret)
return ret;
if (cmd == UCSI_GET_ERROR_STATUS)
return -EIO;
}
return ucsi_read_error(ucsi, connector_num);
}