Commit 4d0a5a99 authored by Jameson Thies's avatar Jameson Thies Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: Clean up UCSI_CABLE_PROP macros 



Clean up UCSI_CABLE_PROP macros by fixing a bitmask shifting error for
plug type and updating the modal support macro for consistent naming.

Fixes: 3cf657f0 ("usb: typec: ucsi: Remove all bit-fields")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Reviewed-by: default avatarPrashant Malani <pmalani@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJameson Thies <jthies@google.com>
Link: https://lore.kernel.org/r/20240305025804.1290919-2-jthies@google.com


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

drivers/usb/typec/ucsi/ucsi.h

+2 −2
Original line number Diff line number Diff line
@@ -259,12 +259,12 @@ struct ucsi_cable_property { 
#define UCSI_CABLE_PROP_FLAG_VBUS_IN_CABLE	BIT(0)

#define UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE	BIT(1)

#define UCSI_CABLE_PROP_FLAG_DIRECTIONALITY	BIT(2)

#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_)	((_f_) & GENMASK(3, 0))

#define UCSI_CABLE_PROP_FLAG_PLUG_TYPE(_f_)	(((_f_) & GENMASK(4, 3)) >> 3)

#define   UCSI_CABLE_PROPERTY_PLUG_TYPE_A	0

#define   UCSI_CABLE_PROPERTY_PLUG_TYPE_B	1

#define   UCSI_CABLE_PROPERTY_PLUG_TYPE_C	2

#define   UCSI_CABLE_PROPERTY_PLUG_OTHER	3

#define UCSI_CABLE_PROP_MODE_SUPPORT		BIT(5)

#define UCSI_CABLE_PROP_FLAG_MODE_SUPPORT	BIT(5)

	u8 latency;

} __packed;