Skip to content

Commit

Permalink
usb: typec: ucsi: move ucsi_acknowledge() from ucsi_read_error()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Baryshkov authored and Greg Kroah-Hartman committed Jul 3, 2024
1 parent f7697db commit a7d2fa7
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/usb/typec/ucsi/ucsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit a7d2fa7

Please sign in to comment.