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: inline ucsi_read_message_in

Browse Source 
There is no need to have a separate wrapper for reading MESSAGE_IN data,
inline it to ucsi_run_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-5-289ddc6874c7@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Baryshkov 2024-06-27 17:44:44 +03:00 committed by Greg Kroah-Hartman
parent 5e9c1662a8
commit e1870c17e5
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,19 +36,6 @@
*/
#define UCSI_SWAP_TIMEOUT_MS 5000
static int ucsi_read_message_in(struct ucsi *ucsi, void *buf,
size_t buf_size)
{
/*
* Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the
* reads here.
*/
if (ucsi->version <= UCSI_VERSION_1_2)
buf_size = clamp(buf_size, 0, 16);
return ucsi->ops->read_message_in(ucsi, buf, buf_size);
}
static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack)
{
u64 ctrl;
@ -70,6 +57,13 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
*cci = 0;
/*
* Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the
* reads here.
*/
if (ucsi->version <= UCSI_VERSION_1_2)
size = clamp(size, 0, 16);
ret = ucsi->ops->sync_control(ucsi, command);
if (ret)
return ret;
@ -98,7 +92,7 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
}
if (data) {
ret = ucsi_read_message_in(ucsi, data, size);
ret = ucsi->ops->read_message_in(ucsi, data, size);
if (ret)
return ret;
}