Commit e1870c17 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: inline ucsi_read_message_in 



There is no need to have a separate wrapper for reading MESSAGE_IN data,
inline it to ucsi_run_command().

Tested-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240627-ucsi-rework-interface-v4-5-289ddc6874c7@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e9c1662

drivers/usb/typec/ucsi/ucsi.c

+8 −14
Original line number Diff line number Diff line
@@ -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;

	}